From abfeaf5e5124b14e1c554382df1018d48cea3fb1 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 17:23:38 -0500
Subject: [PATCH] --- yaml --- r: 129890 b: refs/heads/master c:
 cad73120ab0dfd484682229346de8c16073577e1 h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/misc/Makefile                        |  1 -
 trunk/drivers/platform/x86/Kconfig                 | 12 ++++++++++++
 trunk/drivers/platform/x86/Makefile                |  1 +
 trunk/drivers/{misc => platform/x86}/dell-laptop.c |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)
 rename trunk/drivers/{misc => platform/x86}/dell-laptop.c (99%)

diff --git a/[refs] b/[refs]
index 830730ed4fa0..a98b760c3620 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3af9bfcb433c110839e4c815a9928377f66bbd0e
+refs/heads/master: cad73120ab0dfd484682229346de8c16073577e1
diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile
index 9cf8ae6e4b39..d5749a7bc777 100644
--- a/trunk/drivers/misc/Makefile
+++ b/trunk/drivers/misc/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
 obj-$(CONFIG_ICS932S401)	+= ics932s401.o
 obj-$(CONFIG_LKDTM)		+= lkdtm.o
 obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
-obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o
 obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)		+= phantom.o
 obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig
index e65448e99b48..9e8f9485f9c9 100644
--- a/trunk/drivers/platform/x86/Kconfig
+++ b/trunk/drivers/platform/x86/Kconfig
@@ -54,6 +54,18 @@ config ASUS_LAPTOP
 
 	  If you have an ACPI-compatible ASUS laptop, say Y or M here.
 
+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
+	default n
+	---help---
+	This driver adds support for rfkill and backlight control to Dell
+	laptops.
+
 config FUJITSU_LAPTOP
 	tristate "Fujitsu Laptop Extras"
 	depends on ACPI
diff --git a/trunk/drivers/platform/x86/Makefile b/trunk/drivers/platform/x86/Makefile
index 1e9de2ae0de5..e29065120be9 100644
--- a/trunk/drivers/platform/x86/Makefile
+++ b/trunk/drivers/platform/x86/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_ASUS_LAPTOP)	+= asus-laptop.o
 obj-$(CONFIG_EEEPC_LAPTOP)	+= eeepc-laptop.o
 obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
 obj-$(CONFIG_COMPAL_LAPTOP)	+= compal-laptop.o
+obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o
 obj-$(CONFIG_ACER_WMI)		+= acer-wmi.o
 obj-$(CONFIG_HP_WMI)		+= hp-wmi.o
 obj-$(CONFIG_TC1100_WMI)	+= tc1100-wmi.o
diff --git a/trunk/drivers/misc/dell-laptop.c b/trunk/drivers/platform/x86/dell-laptop.c
similarity index 99%
rename from trunk/drivers/misc/dell-laptop.c
rename to trunk/drivers/platform/x86/dell-laptop.c
index 4d33a2068b7a..16e11c2ee19a 100644
--- a/trunk/drivers/misc/dell-laptop.c
+++ b/trunk/drivers/platform/x86/dell-laptop.c
@@ -22,7 +22,7 @@
 #include <linux/rfkill.h>
 #include <linux/power_supply.h>
 #include <linux/acpi.h>
-#include "../firmware/dcdbas.h"
+#include "../../firmware/dcdbas.h"
 
 #define BRIGHTNESS_TOKEN 0x7d