[kernel] r7344 - in dists/trunk/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Tue Sep  5 15:37:19 2006
New Revision: 7344

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/changelog

Log:
arm/iop32x: Disable CONFIG_EMBEDDED.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Tue Sep  5 15:37:19 2006
@@ -26,7 +26,7 @@
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_EMBEDDED=y
+# CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -37,10 +37,8 @@
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-# CONFIG_SLAB is not set
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-CONFIG_SLOB=y
 CONFIG_OBSOLETE_INTERMODULE=y
 
 #
@@ -977,7 +975,7 @@
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Sep  5 15:37:19 2006
@@ -3,6 +3,7 @@
   [ Martin Michlmayr ]
   * Bump build-dependency on kernel-package to 10.054.
   * arm/iop32x: Build ext2/3 as modules.
+  * arm/iop32x: Disable CONFIG_EMBEDDED.
 
  -- Bastian Blank <waldi at debian.org>  Tue,  5 Sep 2006 11:05:54 +0200