diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/powerpc/kernel/legacy_serial.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 662cd67428de..cea8045ba40b 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -115,7 +115,8 @@ static int __init add_legacy_soc_port(struct device_node *np, | |||
| 115 | { | 115 | { |
| 116 | u64 addr; | 116 | u64 addr; |
| 117 | const u32 *addrp; | 117 | const u32 *addrp; |
| 118 | upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; | 118 | upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ |
| 119 | | UPF_FIXED_PORT; | ||
| 119 | struct device_node *tsi = of_get_parent(np); | 120 | struct device_node *tsi = of_get_parent(np); |
| 120 | 121 | ||
| 121 | /* We only support ports that have a clock frequency properly | 122 | /* We only support ports that have a clock frequency properly |