git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus-3.0
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91sam9261_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9261_devices.c
b/arch/arm/mach-at91/at91sam9261_devices.c
index
3eb4538
..
5004bf0
100644
(file)
--- a/
arch/arm/mach-at91/at91sam9261_devices.c
+++ b/
arch/arm/mach-at91/at91sam9261_devices.c
@@
-1013,7
+1013,7
@@
void __init at91_set_serial_console(unsigned portnr)
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
{
if (portnr < ATMEL_MAX_UART) {
atmel_default_console_device = at91_uarts[portnr];
- at91sam9261_set_console_clock(
portnr
);
+ at91sam9261_set_console_clock(
at91_uarts[portnr]->id
);
}
}
}
}