diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:39:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:39:51 +0100 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/powerpc/boot/dts/mpc8315erdb.dts | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
| download | talos-op-linux-198030782cedf25391e67e7c88b04f87a5eb6563.tar.gz talos-op-linux-198030782cedf25391e67e7c88b04f87a5eb6563.zip | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8315erdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8315erdb.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts index 072c9b0f8c8e..71784165b77e 100644 --- a/arch/powerpc/boot/dts/mpc8315erdb.dts +++ b/arch/powerpc/boot/dts/mpc8315erdb.dts @@ -255,7 +255,7 @@ device_type = "serial"; compatible = "ns16550"; reg = <0x4500 0x100>; - clock-frequency = <0>; + clock-frequency = <133333333>; interrupts = <9 0x8>; interrupt-parent = <&ipic>; }; @@ -265,7 +265,7 @@ device_type = "serial"; compatible = "ns16550"; reg = <0x4600 0x100>; - clock-frequency = <0>; + clock-frequency = <133333333>; interrupts = <10 0x8>; interrupt-parent = <&ipic>; }; |
