diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-04 04:22:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-04 04:22:00 +0000 |
| commit | 966ea8c4b74aa6fde2d58c50a904619fd849ae93 (patch) | |
| tree | 15f02bbcf6112575dbec30c3f7603a393b4dee3a /arch/powerpc/boot/dts/haleakala.dts | |
| parent | 41c5ae6898454277ec88e8e7278c8c58026363a3 (diff) | |
| parent | 976dde010e513a9c7c3117a32b7b015f84b37430 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 5dd3d15f0feb..ae68fefc01b6 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 */ |