diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 15:23:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 15:23:35 +0100 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/arm/mach-mmp/gplugd.c | |
| parent | Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers (diff) | |
| parent | ARM: mx28evk: set a initial clock rate for saif (diff) | |
| download | linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.zip | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
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 933420a7c3ba..e266f66a4670 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)); platform_device_register(&pxa168_device_gpio); |