Index: linux-2.6/drivers/video/backlight/Kconfig
===================================================================
--- linux-2.6.orig/drivers/video/backlight/Kconfig	2007-02-21 20:45:27.000000000 +0100
+++ linux-2.6/drivers/video/backlight/Kconfig	2007-02-21 20:47:14.000000000 +0100
@@ -34,7 +34,7 @@
 
 config BACKLIGHT_CORGI
 	tristate "Sharp Corgi Backlight Driver (SL Series)"
-	depends on BACKLIGHT_CLASS_DEVICE && PXA_SHARPSL
+	depends on BACKLIGHT_CLASS_DEVICE
 	default y
 	help
 	  If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
Index: linux-2.6/arch/arm/mach-pxa/corgi.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-pxa/corgi.c	2007-02-21 20:44:34.000000000 +0100
+++ linux-2.6/arch/arm/mach-pxa/corgi.c	2007-02-21 20:46:41.000000000 +0100
@@ -39,6 +39,7 @@
 #include <asm/arch/udc.h>
 #include <asm/arch/corgi.h>
 #include <asm/arch/sharpsl.h>
+#include <linux/corgi_bl.h>
 
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/scoop.h>
Index: linux-2.6/include/asm-arm/arch-pxa/sharpsl.h
===================================================================
--- linux-2.6.orig/include/asm-arm/arch-pxa/sharpsl.h	2007-02-21 20:44:34.000000000 +0100
+++ linux-2.6/include/asm-arm/arch-pxa/sharpsl.h	2007-02-21 20:46:41.000000000 +0100
@@ -23,18 +23,6 @@
 
 
 /*
- * SharpSL Backlight
- */
-struct corgibl_machinfo {
-	int max_intensity;
-	int default_intensity;
-	int limit_mask;
-	void (*set_bl_intensity)(int intensity);
-};
-extern void corgibl_limit_intensity(int limit);
-
-
-/*
  * SharpSL Battery/PM Driver
  */
 extern void sharpsl_battery_kick(void);
Index: linux-2.6/include/linux/corgi_bl.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6/include/linux/corgi_bl.h	2007-02-21 20:46:41.000000000 +0100
@@ -0,0 +1,10 @@
+/*
+ * Generic Backlight, from sharpsl.h
+ */
+struct corgibl_machinfo {
+	int max_intensity;
+	int default_intensity;
+	int limit_mask;
+	void (*set_bl_intensity)(int intensity);
+};
+extern void corgibl_limit_intensity(int limit);
Index: linux-2.6/arch/arm/mach-pxa/spitz.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-pxa/spitz.c	2007-02-21 20:46:28.000000000 +0100
+++ linux-2.6/arch/arm/mach-pxa/spitz.c	2007-02-21 20:46:41.000000000 +0100
@@ -43,6 +43,7 @@
 #include <asm/arch/akita.h>
 #include <asm/arch/spitz.h>
 #include <asm/arch/sharpsl.h>
+#include <linux/corgi_bl.h>
 
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/scoop.h>
Index: linux-2.6/drivers/video/backlight/corgi_bl.c
===================================================================
--- linux-2.6.orig/drivers/video/backlight/corgi_bl.c	2007-02-21 20:45:27.000000000 +0100
+++ linux-2.6/drivers/video/backlight/corgi_bl.c	2007-02-21 20:46:41.000000000 +0100
@@ -18,7 +18,7 @@
 #include <linux/mutex.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
-#include <asm/arch/sharpsl.h>
+#include <linux/corgi_bl.h>
 #include <asm/hardware/sharpsl_pm.h>
 
 static int corgibl_intensity;