diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2009-04-01 10:30:07 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-04-03 22:26:34 -0400 |
commit | 50f6bb0ab75794ad02cb5db503cc8c99465ceaf4 (patch) | |
tree | c04c63dda909270ebd962aaa566990743a421f8a /arch/arm/mach-pxa/cm-x2xx.c | |
parent | 81854f82c5c1a203b2f5c94f6aa2ed8b8e19f025 (diff) |
[ARM] pxa/cm-x2xx: fix ucb1400 not being registered
This patch fixes cm-x2xx not registering the ucb1400. This is
because of the splitting of ucb1400 driver half year ago.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index 117b5435f8d5..b50ef39eabfc 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c | |||
@@ -121,7 +121,7 @@ static inline void cmx2xx_init_dm9000(void) {} | |||
121 | /* UCB1400 touchscreen controller */ | 121 | /* UCB1400 touchscreen controller */ |
122 | #if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE) | 122 | #if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE) |
123 | static struct platform_device cmx2xx_ts_device = { | 123 | static struct platform_device cmx2xx_ts_device = { |
124 | .name = "ucb1400_ts", | 124 | .name = "ucb1400_core", |
125 | .id = -1, | 125 | .id = -1, |
126 | }; | 126 | }; |
127 | 127 | ||