Merge branch 'for-rmk' of git://git.android.com/kernel into devel

2008-10-22 19:34:09 +01:00
parent bcbfe664e7 f030d7b65e
commit f20e3b5fe7
1075 changed files with 48305 additions and 21245 deletions
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -223,7 +223,7 @@ config TOUCHSCREEN_ATMEL_TSADCC

 config TOUCHSCREEN_UCB1400
 	tristate "Philips UCB1400 touchscreen"
-	select AC97_BUS
+	depends on AC97_BUS
 	depends on UCB1400_CORE
 	help
 	  This enables support for the Philips UCB1400 touchscreen interface.
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -5,7 +5,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/adc.h>
-#include <asm/hp6xx.h>
+#include <mach/hp6xx.h>

 #define MODNAME "hp680_ts_input"