diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-11 16:43:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-11 16:43:22 -0500 |
| commit | 486936cd93e99c802153b3f2f629c5ce62b8c0d4 (patch) | |
| tree | 51e261a96e1fb6b51d4a6afb92bfc2480e150b6c /arch/powerpc/boot | |
| parent | 1c1b777a5673b57a6c0377ba60a790d05e4a0676 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/gef_sbc610.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts index 6ed608322ddc..e48cfa740c8a 100644 --- a/arch/powerpc/boot/dts/gef_sbc610.dts +++ b/arch/powerpc/boot/dts/gef_sbc610.dts | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | compatible = "simple-bus"; | 108 | compatible = "simple-bus"; |
| 109 | ranges = <0x0 0xfef00000 0x00100000>; | 109 | ranges = <0x0 0xfef00000 0x00100000>; |
| 110 | reg = <0xfef00000 0x100000>; // CCSRBAR 1M | 110 | reg = <0xfef00000 0x100000>; // CCSRBAR 1M |
| 111 | bus-frequency = <0>; | 111 | bus-frequency = <33333333>; |
| 112 | 112 | ||
| 113 | i2c1: i2c@3000 { | 113 | i2c1: i2c@3000 { |
| 114 | #address-cells = <1>; | 114 | #address-cells = <1>; |