diff --git a/[refs] b/[refs] index 127a9ae296a2..197c619c41b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4788df4cf44fd14847d37f88daea649f01c01017 +refs/heads/master: 8c5d30e590593495c5bb8bd4a2519ce1ac909a22 diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index df1f86b5c83e..ba137c8b263e 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -210,19 +210,6 @@ config SGI_GRU_DEBUG This option enables addition debugging code for the SGI GRU driver. If you are unsure, say N. -config DELL_LAPTOP - tristate "Dell Laptop Extras (EXPERIMENTAL)" - depends on X86 - depends on DCDBAS - depends on EXPERIMENTAL - depends on BACKLIGHT_CLASS_DEVICE - depends on RFKILL - depends on POWER_SUPPLY - default n - ---help--- - This driver adds support for rfkill and backlight control to Dell - laptops. - config ISL29003 tristate "Intersil ISL29003 ambient light sensor" depends on I2C && SYSFS