Index: linux-2.6.16/arch/arm/mach-pxa/ezx.c
===================================================================
--- linux-2.6.16.orig/arch/arm/mach-pxa/ezx.c	2007-01-18 14:19:06.000000000 +0100
+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2007-01-18 14:37:57.000000000 +0100
@@ -776,11 +776,14 @@
 	pxa_set_kbd_info(&ezx_kbd_platform_data);
 
 	ssp_pcap_init();
-
+#ifdef PXA_EZX_PCAP_EMU_USB
 	emu_switch_to(EMU_SWITCH_TO_USB);
+#endif
 
+#ifdef PXA_EZX_PCAP_EMU_UART
 	/* enable this line when you want to run FFUART on the USB plug */
-	//emu_switch_to(EMU_SWITCH_TO_UART);
+	emu_switch_to(EMU_SWITCH_TO_UART);
+#endif
 	/* enable this line when you want to output power on the USB plug */
 	//SSP_PCAP_bit_set(SSP_PCAP_ADJ_BIT_BUSCTRL_VUSB_MSTR_EN);
 
Index: linux-2.6.16/arch/arm/mach-pxa/Kconfig
===================================================================
--- linux-2.6.16.orig/arch/arm/mach-pxa/Kconfig	2007-01-18 14:38:14.000000000 +0100
+++ linux-2.6.16/arch/arm/mach-pxa/Kconfig	2007-01-18 14:47:22.000000000 +0100
@@ -2,8 +2,8 @@
 
 config PXA_EZX
  	bool
-	#select PXA_SPI
-	#select PXA_EZX_PCAP
+	select PXA_SPI
+	select PXA_EZX_PCAP
 
 menu "Intel PXA2xx Implementations"
 
@@ -146,15 +146,29 @@
 	  Enable support for PXA2xx SSP ports
 
 config PXA_SPI
-	tristate "SPI controller driver for PXA2xx"
+	bool "SPI controller driver for PXA2xx"
 	help
 	  Enable support for PXA2xx SPI
 
 config PXA_EZX_PCAP
-	tristate "SPI protocol driver for PCAP2"
+	bool "SPI protocol driver for PCAP2"
 
 config PXA_EZX_PCAP_EMU
 	depends on PXA_EZX_PCAP
 	tristate "PCAP2 EMU"
 
+choice
+	prompt "Select EMU mode"
+	depends on PXA_EZX_PCAP_EMU
+
+config PXA_EZX_PCAP_EMU_USB
+	depends on PXA_EZX_PCAP_EMU
+	bool "USB mode"
+
+config PXA_EZX_PCAP_EMU_UART
+	depends on PXA_EZX_PCAP_EMU
+	bool "UART mode"
+
+endchoice
+
 endif