diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2011-10-18 04:10:07 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-10-21 00:56:43 -0400 |
| commit | 95e82747d6e2abc513bfae416e6009968985d05b (patch) | |
| tree | 12791f13a15d89f7ea8e22a8e0243edb498cb95d | |
| parent | 7a79a80f50a9c7f76b257a3a55dd6a055e6893cf (diff) | |
m68k: drop unused Kconfig symbols
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/Kconfig.devices | 28 | ||||
| -rw-r--r-- | arch/m68k/Kconfig.machine | 43 |
2 files changed, 1 insertions, 70 deletions
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices index d964dc4c2ce8..dbff9413646f 100644 --- a/arch/m68k/Kconfig.devices +++ b/arch/m68k/Kconfig.devices | |||
| @@ -77,32 +77,6 @@ config MULTIFACE_III_TTY | |||
| 77 | 77 | ||
| 78 | To compile this driver as a module, choose M here. | 78 | To compile this driver as a module, choose M here. |
| 79 | 79 | ||
| 80 | config GVPIOEXT | ||
| 81 | tristate "GVP IO-Extender support" | ||
| 82 | depends on PARPORT=n && ZORRO | ||
| 83 | help | ||
| 84 | If you want to use a GVP IO-Extender serial card in Linux, say Y. | ||
| 85 | Otherwise, say N. | ||
| 86 | |||
| 87 | config GVPIOEXT_LP | ||
| 88 | tristate "GVP IO-Extender parallel printer support" | ||
| 89 | depends on GVPIOEXT | ||
| 90 | help | ||
| 91 | Say Y to enable driving a printer from the parallel port on your | ||
| 92 | GVP IO-Extender card, N otherwise. | ||
| 93 | |||
| 94 | config GVPIOEXT_PLIP | ||
| 95 | tristate "GVP IO-Extender PLIP support" | ||
| 96 | depends on GVPIOEXT | ||
| 97 | help | ||
| 98 | Say Y to enable doing IP over the parallel port on your GVP | ||
| 99 | IO-Extender card, N otherwise. | ||
| 100 | |||
| 101 | config MAC_HID | ||
| 102 | bool | ||
| 103 | depends on INPUT_ADBHID | ||
| 104 | default y | ||
| 105 | |||
| 106 | config HPDCA | 80 | config HPDCA |
| 107 | tristate "HP DCA serial support" | 81 | tristate "HP DCA serial support" |
| 108 | depends on DIO && SERIAL_8250 | 82 | depends on DIO && SERIAL_8250 |
| @@ -145,7 +119,7 @@ config DN_SERIAL | |||
| 145 | 119 | ||
| 146 | config SERIAL_CONSOLE | 120 | config SERIAL_CONSOLE |
| 147 | bool "Support for serial port console" | 121 | bool "Support for serial port console" |
| 148 | depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL) | 122 | depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL) |
| 149 | ---help--- | 123 | ---help--- |
| 150 | If you say Y here, it will be possible to use a serial port as the | 124 | If you say Y here, it will be possible to use a serial port as the |
| 151 | system console (the system console is the device which receives all | 125 | system console (the system console is the device which receives all |
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index 7d5c20b896c7..ef4a26aff780 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine | |||
| @@ -303,9 +303,6 @@ config COBRA5282 | |||
| 303 | help | 303 | help |
| 304 | Support for the senTec COBRA5282 board. | 304 | Support for the senTec COBRA5282 board. |
| 305 | 305 | ||
| 306 | config EMAC_INC | ||
| 307 | bool | ||
| 308 | |||
| 309 | config SOM5282EM | 306 | config SOM5282EM |
| 310 | bool "EMAC.Inc SOM5282EM board support" | 307 | bool "EMAC.Inc SOM5282EM board support" |
| 311 | depends on M528x | 308 | depends on M528x |
| @@ -371,27 +368,21 @@ config FIREBEE | |||
| 371 | help | 368 | help |
| 372 | Support for the FireBee ColdFire 5475 based board. | 369 | Support for the FireBee ColdFire 5475 based board. |
| 373 | 370 | ||
| 374 | config HW_FEITH | ||
| 375 | bool | ||
| 376 | |||
| 377 | config CLEOPATRA | 371 | config CLEOPATRA |
| 378 | bool "Feith CLEOPATRA board support" | 372 | bool "Feith CLEOPATRA board support" |
| 379 | depends on (M5307 || M5407) | 373 | depends on (M5307 || M5407) |
| 380 | select HW_FEITH | ||
| 381 | help | 374 | help |
| 382 | Support for the Feith Cleopatra boards. | 375 | Support for the Feith Cleopatra boards. |
| 383 | 376 | ||
| 384 | config CANCam | 377 | config CANCam |
| 385 | bool "Feith CANCam board support" | 378 | bool "Feith CANCam board support" |
| 386 | depends on M5272 | 379 | depends on M5272 |
| 387 | select HW_FEITH | ||
| 388 | help | 380 | help |
| 389 | Support for the Feith CANCam board. | 381 | Support for the Feith CANCam board. |
| 390 | 382 | ||
| 391 | config SCALES | 383 | config SCALES |
| 392 | bool "Feith SCALES board support" | 384 | bool "Feith SCALES board support" |
| 393 | depends on M5272 | 385 | depends on M5272 |
| 394 | select HW_FEITH | ||
| 395 | help | 386 | help |
| 396 | Support for the Feith SCALES board. | 387 | Support for the Feith SCALES board. |
| 397 | 388 | ||
| @@ -438,13 +429,6 @@ if !MMU || COLDFIRE | |||
| 438 | 429 | ||
| 439 | comment "Machine Options" | 430 | comment "Machine Options" |
| 440 | 431 | ||
| 441 | config ROMFS_FROM_ROM | ||
| 442 | bool "ROMFS image not RAM resident" | ||
| 443 | depends on (NETtel || SNAPGEAR) | ||
| 444 | help | ||
| 445 | The ROMfs filesystem will stay resident in the FLASH/ROM, not be | ||
| 446 | moved into RAM. | ||
| 447 | |||
| 448 | config UBOOT | 432 | config UBOOT |
| 449 | bool "Support for U-Boot command line parameters" | 433 | bool "Support for U-Boot command line parameters" |
| 450 | help | 434 | help |
| @@ -524,33 +508,6 @@ config KERNELBASE | |||
| 524 | a system with the RAM based at address 0, and leaving enough room | 508 | a system with the RAM based at address 0, and leaving enough room |
| 525 | for the theoretical maximum number of 256 vectors. | 509 | for the theoretical maximum number of 256 vectors. |
| 526 | 510 | ||
| 527 | choice | ||
| 528 | prompt "RAM bus width" | ||
| 529 | default RAMAUTOBIT | ||
| 530 | |||
| 531 | config RAMAUTOBIT | ||
| 532 | bool "AUTO" | ||
| 533 | help | ||
| 534 | Select the physical RAM data bus size. Not needed on most platforms, | ||
| 535 | so you can generally choose AUTO. | ||
| 536 | |||
| 537 | config RAM8BIT | ||
| 538 | bool "8bit" | ||
| 539 | help | ||
| 540 | Configure RAM bus to be 8 bits wide. | ||
| 541 | |||
| 542 | config RAM16BIT | ||
| 543 | bool "16bit" | ||
| 544 | help | ||
| 545 | Configure RAM bus to be 16 bits wide. | ||
| 546 | |||
| 547 | config RAM32BIT | ||
| 548 | bool "32bit" | ||
| 549 | help | ||
| 550 | Configure RAM bus to be 32 bits wide. | ||
| 551 | |||
| 552 | endchoice | ||
| 553 | |||
| 554 | comment "ROM configuration" | 511 | comment "ROM configuration" |
| 555 | 512 | ||
| 556 | config ROM | 513 | config ROM |
