Merge branch 'pxa-palm' into pxa-machines

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
This commit is contained in:
Russell King
2008-10-07 19:07:22 +01:00
committed by Russell King
20 changed files with 2464 additions and 513 deletions
+1
View File
@@ -220,6 +220,7 @@ config TOUCHSCREEN_ATMEL_TSADCC
config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen"
select AC97_BUS
depends on UCB1400_CORE
help
This enables support for the Philips UCB1400 touchscreen interface.
The UCB1400 is an AC97 audio codec. The touchscreen interface