Index: linux/arch/arm/mach-sa1100/Kconfig
===================================================================
--- linux.orig/arch/arm/mach-sa1100/Kconfig
+++ linux/arch/arm/mach-sa1100/Kconfig
@@ -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
Index: linux/arch/arm/mach-sa1100/Makefile
===================================================================
--- linux.orig/arch/arm/mach-sa1100/Makefile
+++ linux/arch/arm/mach-sa1100/Makefile
@@ -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