diff options
-rw-r--r-- | drivers/misc/Kconfig | 17 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/Kconfig | 1 |
3 files changed, 3 insertions, 16 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 6a1a092db146..c7795096d43b 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -2,24 +2,14 @@ | |||
2 | # Misc strange devices | 2 | # Misc strange devices |
3 | # | 3 | # |
4 | 4 | ||
5 | # This one has to live outside of the MISC_DEVICES conditional, | 5 | menu "Misc devices" |
6 | # because it may be selected by drivers/platform/x86/hp_accel. | 6 | |
7 | config SENSORS_LIS3LV02D | 7 | config SENSORS_LIS3LV02D |
8 | tristate | 8 | tristate |
9 | depends on INPUT | 9 | depends on INPUT |
10 | select INPUT_POLLDEV | 10 | select INPUT_POLLDEV |
11 | default n | 11 | default n |
12 | 12 | ||
13 | menuconfig MISC_DEVICES | ||
14 | bool "Misc devices" | ||
15 | ---help--- | ||
16 | Say Y here to get to see options for device drivers from various | ||
17 | different categories. This option alone does not add any kernel code. | ||
18 | |||
19 | If you say N, all options in this submenu will be skipped and disabled. | ||
20 | |||
21 | if MISC_DEVICES | ||
22 | |||
23 | config AD525X_DPOT | 13 | config AD525X_DPOT |
24 | tristate "Analog Devices Digital Potentiometers" | 14 | tristate "Analog Devices Digital Potentiometers" |
25 | depends on (I2C || SPI) && SYSFS | 15 | depends on (I2C || SPI) && SYSFS |
@@ -516,5 +506,4 @@ source "drivers/misc/ti-st/Kconfig" | |||
516 | source "drivers/misc/lis3lv02d/Kconfig" | 506 | source "drivers/misc/lis3lv02d/Kconfig" |
517 | source "drivers/misc/carma/Kconfig" | 507 | source "drivers/misc/carma/Kconfig" |
518 | source "drivers/misc/altera-stapl/Kconfig" | 508 | source "drivers/misc/altera-stapl/Kconfig" |
519 | 509 | endmenu | |
520 | endif # MISC_DEVICES | ||
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index cf444b0ca2cc..00fcbed1afd2 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -477,7 +477,6 @@ config MMC_SDHI | |||
477 | config MMC_CB710 | 477 | config MMC_CB710 |
478 | tristate "ENE CB710 MMC/SD Interface support" | 478 | tristate "ENE CB710 MMC/SD Interface support" |
479 | depends on PCI | 479 | depends on PCI |
480 | select MISC_DEVICES | ||
481 | select CB710_CORE | 480 | select CB710_CORE |
482 | help | 481 | help |
483 | This option enables support for MMC/SD part of ENE CB710/720 Flash | 482 | This option enables support for MMC/SD part of ENE CB710/720 Flash |
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig index 1ea811cf515b..fe42fc00d8d3 100644 --- a/drivers/net/ethernet/micrel/Kconfig +++ b/drivers/net/ethernet/micrel/Kconfig | |||
@@ -42,7 +42,6 @@ config KS8851 | |||
42 | select NET_CORE | 42 | select NET_CORE |
43 | select MII | 43 | select MII |
44 | select CRC32 | 44 | select CRC32 |
45 | select MISC_DEVICES | ||
46 | select EEPROM_93CX6 | 45 | select EEPROM_93CX6 |
47 | ---help--- | 46 | ---help--- |
48 | SPI driver for Micrel KS8851 SPI attached network chip. | 47 | SPI driver for Micrel KS8851 SPI attached network chip. |