diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /drivers/input/touchscreen/Kconfig | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 4bec8422821f..971618059a6f 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
| @@ -151,7 +151,7 @@ config TOUCHSCREEN_TOUCHWIN | |||
| 151 | 151 | ||
| 152 | config TOUCHSCREEN_UCB1400 | 152 | config TOUCHSCREEN_UCB1400 |
| 153 | tristate "Philips UCB1400 touchscreen" | 153 | tristate "Philips UCB1400 touchscreen" |
| 154 | select SND_AC97_BUS | 154 | select AC97_BUS |
| 155 | help | 155 | help |
| 156 | This enables support for the Philips UCB1400 touchscreen interface. | 156 | This enables support for the Philips UCB1400 touchscreen interface. |
| 157 | The UCB1400 is an AC97 audio codec. The touchscreen interface | 157 | The UCB1400 is an AC97 audio codec. The touchscreen interface |