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

This commit is contained in:
Russell King
2008-10-22 19:34:09 +01:00
committed by Russell King
1075 changed files with 48305 additions and 21245 deletions
+1 -1
View File
@@ -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.