diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 23:00:49 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 23:00:49 +0100 |
| commit | a4581b35e1bc80becf240238bc787a5ec2727db0 (patch) | |
| tree | 34cbf36101639403a766e74deb36e7015d871b39 /arch/arm/mach-mmp/gplugd.c | |
| parent | video: s3c2410: fix checkpatch error and warnings (diff) | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-a4581b35e1bc80becf240238bc787a5ec2727db0.tar.xz linux-a4581b35e1bc80becf240238bc787a5ec2727db0.zip | |
Merge commit 'v3.2-rc6' into fbdev-next
Diffstat (limited to 'arch/arm/mach-mmp/gplugd.c')
| -rw-r--r-- | arch/arm/mach-mmp/gplugd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 69156568bc41..4665767a4f79 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -182,7 +182,7 @@ static void __init gplugd_init(void) /* on-chip devices */ pxa168_add_uart(3); - pxa168_add_ssp(0); + pxa168_add_ssp(1); pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info)); pxa168_add_eth(&gplugd_eth_platform_data); |