diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/arch/arm/Kconfig linux-2.6.12-rc5-makefiles/arch/arm/Kconfig
--- linux-2.6.12-rc5-lcd/arch/arm/Kconfig	2005-06-06 14:29:53.316218381 -0500
+++ linux-2.6.12-rc5-makefiles/arch/arm/Kconfig	2005-06-06 14:30:51.976128816 -0500
@@ -729,6 +729,10 @@
 
 source "drivers/mmc/Kconfig"
 
+source "drivers/leds/Kconfig"
+
+source "drivers/ucb/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"
diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/arch/arm/mach-sa1100/Kconfig linux-2.6.12-rc5-makefiles/arch/arm/mach-sa1100/Kconfig
--- linux-2.6.12-rc5-lcd/arch/arm/mach-sa1100/Kconfig	2005-06-06 14:29:53.421194957 -0500
+++ linux-2.6.12-rc5-makefiles/arch/arm/mach-sa1100/Kconfig	2005-06-06 14:30:51.964131493 -0500
@@ -48,6 +48,7 @@
 	select SHARP_LOCOMO
 	select SHARP_SCOOP
 	select SHARP_PARAM
+	select SA1100_UCB1x00
 	help
 	  Say Y here to support the Sharp Zaurus SL5500 PDAs.
 
@@ -159,4 +160,8 @@
 
 endmenu
 
+config SA1100_UCB1x00
+	bool "SA1100 UCB1x00 support"
+	default N
+
 endif
diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/arch/arm/mach-sa1100/Makefile linux-2.6.12-rc5-makefiles/arch/arm/mach-sa1100/Makefile
--- linux-2.6.12-rc5-lcd/arch/arm/mach-sa1100/Makefile	2005-03-02 01:38:33.000000000 -0600
+++ linux-2.6.12-rc5-makefiles/arch/arm/mach-sa1100/Makefile	2005-06-06 14:30:51.964131493 -0500
@@ -51,3 +51,4 @@
 # Miscelaneous functions
 obj-$(CONFIG_PM)			+= pm.o sleep.o
 obj-$(CONFIG_SA1100_SSP)		+= ssp.o
+obj-$(CONFIG_SA1100_UCB1x00)		+= ucb1x00.o
diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/drivers/Makefile linux-2.6.12-rc5-makefiles/drivers/Makefile
--- linux-2.6.12-rc5-lcd/drivers/Makefile	2005-06-06 14:29:53.962074263 -0500
+++ linux-2.6.12-rc5-makefiles/drivers/Makefile	2005-06-06 14:30:51.953133947 -0500
@@ -64,3 +64,5 @@
 obj-$(CONFIG_BLK_DEV_SGIIOC4)	+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
+obj-$(CONFIG_CLASS_LEDS)	+= leds/
+obj-$(CONFIG_UCB1x00)		+= ucb/
diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/drivers/mtd/maps/Kconfig linux-2.6.12-rc5-makefiles/drivers/mtd/maps/Kconfig
--- linux-2.6.12-rc5-lcd/drivers/mtd/maps/Kconfig	2005-06-06 14:29:54.543944423 -0500
+++ linux-2.6.12-rc5-makefiles/drivers/mtd/maps/Kconfig	2005-06-06 14:30:51.113321346 -0500
@@ -477,7 +477,7 @@
 
 config MTD_SA1100
 	tristate "CFI Flash device mapped on StrongARM SA11x0"
-	depends on ARM && MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS
+	depends on ARM && (MTD_CFI || MTD_SHARP) && ARCH_SA1100 && MTD_PARTITIONS
 	help
 	  This enables access to the flash chips on most platforms based on
 	  the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
diff -Naur -X ../linux/Documentation/dontdiff linux-2.6.12-rc5-lcd/drivers/video/backlight/Makefile linux-2.6.12-rc5-makefiles/drivers/video/backlight/Makefile
--- linux-2.6.12-rc5-lcd/drivers/video/backlight/Makefile	2005-03-02 01:38:34.000000000 -0600
+++ linux-2.6.12-rc5-makefiles/drivers/video/backlight/Makefile	2005-06-06 14:30:51.135316438 -0500
@@ -3,3 +3,4 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)	+= corgi_bl.o
+obj-$(CONFIG_SHARP_LOCOMO)	+= locomolcd.o