diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /arch/arm/config.in | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'arch/arm/config.in')
| -rw-r--r-- | arch/arm/config.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/config.in b/arch/arm/config.in index ff683b30b..15fba3403 100644 --- a/arch/arm/config.in +++ b/arch/arm/config.in @@ -12,6 +12,7 @@ define_bool CONFIG_UID16 y mainmenu_option next_comment comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL +bool 'Prompt for obsolete code/drivers' CONFIG_OBSOLETE endmenu @@ -45,8 +46,8 @@ if [ "$CONFIG_ARCH_SA1100" = "y" ]; then if [ "$CONFIG_SA1100_ASSABET" = "y" ]; then bool ' Include support for Neponset' CONFIG_ASSABET_NEPONSET fi - bool ' Include support for Bitsy' CONFIG_SA1100_BITSY bool ' Include support for Brutus' CONFIG_SA1100_BRUTUS + bool ' Include support for Compaq iPAQ 3600 (Bitsy)' CONFIG_SA1100_BITSY # bool ' Include support for Empeg' CONFIG_SA1100_EMPEG # bool ' Include support for Itsy' CONFIG_SA1100_ITSY bool ' Include support for LART' CONFIG_SA1100_LART @@ -342,7 +343,7 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'Kernel low-level debugging functions' CONFIG_DEBUG_LL if [ "$CONFIG_DEBUG_LL" = "y" ]; then if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then - bool 'Kernel low-level debugging messages via DC21285 port' CONFIG_DEBUG_DC21285_PORT + bool 'Kernel low-level debugging messages via footbridge serial port' CONFIG_DEBUG_DC21285_PORT fi fi fi |