diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-06 09:57:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-06 09:57:38 +0100 |
| commit | 89de3820c7ae615345c093ae6fddac01f326fdc4 (patch) | |
| tree | 3e433ef080c3e1b691914a33d2d9e674f0744b47 /arch/arm/mach-pxa/cm-x2xx.c | |
| parent | 3ef48fac6e8e2362a4e6ef31dd043c89fe107875 (diff) | |
| parent | 80748fb8ff3bc068dccacb690cd2eb417b034ec7 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 117b5435f8d..b50ef39eabf 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) {} /* UCB1400 touchscreen controller */ #if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE) static struct platform_device cmx2xx_ts_device = { - .name = "ucb1400_ts", + .name = "ucb1400_core", .id = -1, }; |