diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2006-08-21 10:46:13 +0000 |
|---|---|---|
| committer | Martin Michlmayr <tbm@cyrius.com> | 2006-08-21 10:46:13 +0000 |
| commit | e6a465fa7ab0a22e67062314e79242f3053b3e82 (patch) | |
| tree | 769a7ab2a416c4fefb6d16d952c63e3abdf855f8 | |
| parent | 3ac3c8e93483c9e582d9b8bafafe2dccb953ae50 (diff) | |
| download | kernel_replicant_linux-e6a465fa7ab0a22e67062314e79242f3053b3e82.tar.gz kernel_replicant_linux-e6a465fa7ab0a22e67062314e79242f3053b3e82.tar.bz2 kernel_replicant_linux-e6a465fa7ab0a22e67062314e79242f3053b3e82.zip | |
arm/iop32x: Turn off CONFIG_EMBEDDED.
svn path=/dists/sid/linux-2.6/; revision=7214
| -rw-r--r-- | debian/arch/arm/config.iop32x | 10 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 58893b809798..8c8bc97ce2a5 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -26,7 +26,7 @@ CONFIG_AUDIT=y 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_BASE_FULL=y 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 @@ CONFIG_INPUT=y # # 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 @@ -1027,7 +1025,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set +CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -1974,7 +1972,7 @@ CONFIG_NLS_UTF8=m # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FS is not set CONFIG_FRAME_POINTER=y # CONFIG_UNWIND_INFO is not set diff --git a/debian/changelog b/debian/changelog index a289c095f469..0b2d9e49b9d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux-2.6 (2.6.17-7) UNRELEASED; urgency=low with "Unknown symbol pci_get_legacy_ide_irq". * arm/iop32x: Enable a number of MD and DM modules. * arm/iop32x: Enable some more USB network modules. + * arm/iop32x: Turn off CONFIG_EMBEDDED. * mipsel/r5k-cobalt: Increase 8250 NR_UARTS and RUNTIME_UARTS to 4. * mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700. |