Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
Dmitry Torokhov
2007-02-10 01:26:32 -05:00
4487 changed files with 226207 additions and 103954 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ config TOUCHSCREEN_TOUCHWIN
config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen"
select SND_AC97_BUS
select AC97_BUS
help
This enables support for the Philips UCB1400 touchscreen interface.
The UCB1400 is an AC97 audio codec. The touchscreen interface
+1 -1
View File
@@ -83,7 +83,7 @@
struct ucb1400 {
ac97_t *ac97;
struct snd_ac97 *ac97;
struct input_dev *ts_idev;
int irq;