diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
| commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
| tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /arch/arm/mach-at91/at91cap9_devices.c | |
| parent | 58f45e3c6f4fd2b9b9d7d43af71409a79a4b4cf6 (diff) | |
| parent | d3144df5bd8eb1c8137cc92989e2e6bc9f2e5a27 (diff) | |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'arch/arm/mach-at91/at91cap9_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91cap9_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index cd850ed6f335..dba0d8d8a4bd 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -1220,7 +1220,7 @@ void __init at91_set_serial_console(unsigned portnr) { if (portnr < ATMEL_MAX_UART) { atmel_default_console_device = at91_uarts[portnr]; - at91cap9_set_console_clock(portnr); + at91cap9_set_console_clock(at91_uarts[portnr]->id); } } |