diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
| commit | 8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch) | |
| tree | 67349c6a69740150b67c4c39de49cde9b3648aa5 /drivers/misc/Kconfig | |
| parent | 94f61a7666224ab307e387ff0d146055ae77e6ab (diff) | |
| parent | e29206381a1436e0f47c0f5b9a23159a03c57715 (diff) | |
| download | blackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz blackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip | |
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 17 |
1 files changed, 3 insertions, 14 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 @@ # Misc strange devices # -# This one has to live outside of the MISC_DEVICES conditional, -# because it may be selected by drivers/platform/x86/hp_accel. +menu "Misc devices" + config SENSORS_LIS3LV02D tristate depends on INPUT select INPUT_POLLDEV default n -menuconfig MISC_DEVICES - bool "Misc devices" - ---help--- - Say Y here to get to see options for device drivers from various - different categories. This option alone does not add any kernel code. - - If you say N, all options in this submenu will be skipped and disabled. - -if MISC_DEVICES - config AD525X_DPOT tristate "Analog Devices Digital Potentiometers" depends on (I2C || SPI) && SYSFS @@ -516,5 +506,4 @@ source "drivers/misc/ti-st/Kconfig" source "drivers/misc/lis3lv02d/Kconfig" source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" - -endif # MISC_DEVICES +endmenu |
