[kernel] update to 2.6.26.5 and 2.6.25.17

[openwrt.git] / target / linux / ixp4xx / patches-2.6.26 / 110-pronghorn_series_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
index 5a19af63a3681c7e53961e80248bc313426027cd..45589a8626f4248c8506b15f4ff401bd6e2768ea 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
@@ -328,15 +328,6 @@
 +      platform_add_devices(pronghorn_devices, ARRAY_SIZE(pronghorn_devices));
 +
 +      if (machine_is_pronghorn()) {
-+              pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
-+              pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
-+
-+              pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
-+              pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
-+
-+              pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
-+              pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
-+      } else {
 +              pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(2);
 +              pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(2);
 +
@@ -345,6 +336,15 @@
 +
 +              pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS2;
 +              pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS3;
++      } else {
++              pronghorn_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(3);
++              pronghorn_pata_resources[0].end = IXP4XX_EXP_BUS_END(3);
++
++              pronghorn_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(4);
++              pronghorn_pata_resources[1].end = IXP4XX_EXP_BUS_END(4);
++
++              pronghorn_pata_data.cs0_cfg = IXP4XX_EXP_CS3;
++              pronghorn_pata_data.cs1_cfg = IXP4XX_EXP_CS4;
 +
 +              platform_device_register(&pronghorn_i2c_gpio);
 +      }