diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 17:38:23 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 17:38:23 +1100 |
| commit | 35d77ef1c05bc3760427954dafaee3ca550542f3 (patch) | |
| tree | 0640a1080e5ae68d84500a05543d357f65099288 /arch/powerpc/boot/dts/haleakala.dts | |
| parent | 4187377b2411d43ea4470b35162917a5093857bf (diff) | |
| parent | f62f2fdd9c33160584b800da8c4a25ff1679225a (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/boot/dts/haleakala.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/haleakala.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts index 5dd3d15f0fe..ae68fefc01b 100644 --- a/arch/powerpc/boot/dts/haleakala.dts +++ b/arch/powerpc/boot/dts/haleakala.dts @@ -235,7 +235,7 @@ #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; - compatible = "ibm,plb-pciex-405exr", "ibm,plb-pciex"; + compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex"; primary; port = <0>; /* port number */ reg = <a0000000 20000000 /* Config space access */ |