diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/input/touchscreen | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 24000f0efeaa..6582816a0477 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
| @@ -557,6 +557,7 @@ static int ucb1400_ts_remove(struct device *dev) | |||
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | static struct device_driver ucb1400_ts_driver = { | 559 | static struct device_driver ucb1400_ts_driver = { |
| 560 | .name = "ucb1400_ts", | ||
| 560 | .owner = THIS_MODULE, | 561 | .owner = THIS_MODULE, |
| 561 | .bus = &ac97_bus_type, | 562 | .bus = &ac97_bus_type, |
| 562 | .probe = ucb1400_ts_probe, | 563 | .probe = ucb1400_ts_probe, |