diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-07 13:39:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-07 13:39:38 -0700 |
| commit | bc67f799e7667fb3c00286f2415c3cc44a253aec (patch) | |
| tree | 271ae5f17012caafe3d3ac3daf0776808b71cf48 /arch/arm/mach-at91/at91sam9263_devices.c | |
| parent | 89c6143263ef8e14e42e17324a234418d8030b10 (diff) | |
| parent | c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a (diff) | |
| download | blackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.tar.gz blackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index ffe081b77ed0..a050f41fc860 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -1395,7 +1395,7 @@ void __init at91_set_serial_console(unsigned portnr) { if (portnr < ATMEL_MAX_UART) { atmel_default_console_device = at91_uarts[portnr]; - at91sam9263_set_console_clock(portnr); + at91sam9263_set_console_clock(at91_uarts[portnr]->id); } } |
