--- android-benno.diff	2008-01-15 15:11:53.000000000 +0100
+++ android.diff	2008-01-15 20:10:05.000000000 +0100
@@ -15102,11 +15102,10 @@
 diff -Nru linux-2.6.23/drivers/input/keyboard/Makefile kernel.android/drivers/input/keyboard/Makefile
 --- linux-2.6.23/drivers/input/keyboard/Makefile	2007-10-10 06:31:38.000000000 +1000
 +++ kernel.android/drivers/input/keyboard/Makefile	2007-11-12 07:49:02.000000000 +1100
-@@ -21,4 +21,4 @@
- obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keyboard.o
+@@ -21,3 +21,4 @@
  obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
  obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o
--
+ obj-$(CONFIG_KEYBOARD_ASIC3)		+= asic3_keys.o
 +obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS)	+= goldfish_events.o
 diff -Nru linux-2.6.23/drivers/input/keyboard/goldfish_events.c kernel.android/drivers/input/keyboard/goldfish_events.c
 --- linux-2.6.23/drivers/input/keyboard/goldfish_events.c	1970-01-01 10:00:00.000000000 +1000
@@ -15827,7 +15826,7 @@
 diff -Nru linux-2.6.23/drivers/mmc/host/Kconfig kernel.android/drivers/mmc/host/Kconfig
 --- linux-2.6.23/drivers/mmc/host/Kconfig	2007-10-10 06:31:38.000000000 +1000
 +++ kernel.android/drivers/mmc/host/Kconfig	2007-11-12 07:49:02.000000000 +1100
-@@ -100,3 +100,10 @@
+@@ -100,6 +100,13 @@
            To compile this driver as a module, choose M here: the
  	  module will be called tifm_sd.
  
@@ -15838,15 +15837,17 @@
 +	  This selects the Goldfish Multimedia card Interface emulation.
 +
 +	  If unsure, say N.
+ config MMC_ASIC3
+ 	tristate "HTC ASIC3 SD/MMC support"
+ 	depends on MMC && HTC_ASIC3
 diff -Nru linux-2.6.23/drivers/mmc/host/Makefile kernel.android/drivers/mmc/host/Makefile
 --- linux-2.6.23/drivers/mmc/host/Makefile	2007-10-10 06:31:38.000000000 +1000
 +++ kernel.android/drivers/mmc/host/Makefile	2007-11-12 07:49:02.000000000 +1100
-@@ -15,4 +15,5 @@
- obj-$(CONFIG_MMC_OMAP)		+= omap.o
+@@ -15,3 +15,4 @@
  obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
+ obj-$(CONFIG_MMC_ASIC3)         += asic3_mmc.o
 +obj-$(CONFIG_MMC_GOLDFISH)	+= goldfish.o
- 
 diff -Nru linux-2.6.23/drivers/mmc/host/goldfish.c kernel.android/drivers/mmc/host/goldfish.c
 --- linux-2.6.23/drivers/mmc/host/goldfish.c	1970-01-01 10:00:00.000000000 +1000
 +++ kernel.android/drivers/mmc/host/goldfish.c	2007-11-12 07:49:02.000000000 +1100