ixp4xx: fix compiler warnings in wrt300nv2-setup.c

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22655 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch
index cc891e2..381cc5b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch
@@ -26,17 +26,18 @@
                .rxq            = 3,
                .txreadyq       = 20,
        }, {
-@@ -111,6 +114,9 @@ static struct platform_device *wrt300nv2
+@@ -110,6 +113,10 @@ static struct platform_device *wrt300nv2
+ 
  static void __init wrt300nv2_init(void)
  {
-       ixp4xx_sys_init();
 +      uint8_t __iomem *f;
 +      int offset = 0;
 +      int i;
++
+       ixp4xx_sys_init();
  
        wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-@@ -119,6 +125,32 @@ static void __init wrt300nv2_init(void)
+@@ -119,6 +126,32 @@ static void __init wrt300nv2_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
  
        platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));

diff --git a/target/linux/ixp4xx/patches-2.6.33/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-2.6.33/132-wrt300nv2_mac_fix.patch
index cc891e2..381cc5b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.33/132-wrt300nv2_mac_fix.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/132-wrt300nv2_mac_fix.patch
@@ -26,17 +26,18 @@
                .rxq            = 3,
                .txreadyq       = 20,
        }, {
-@@ -111,6 +114,9 @@ static struct platform_device *wrt300nv2
+@@ -110,6 +113,10 @@ static struct platform_device *wrt300nv2
+ 
  static void __init wrt300nv2_init(void)
  {
-       ixp4xx_sys_init();
 +      uint8_t __iomem *f;
 +      int offset = 0;
 +      int i;
++
+       ixp4xx_sys_init();
  
        wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-@@ -119,6 +125,32 @@ static void __init wrt300nv2_init(void)
+@@ -119,6 +126,32 @@ static void __init wrt300nv2_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
  
        platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));

diff --git a/target/linux/ixp4xx/patches-2.6.34/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-2.6.34/132-wrt300nv2_mac_fix.patch
index cc891e2..381cc5b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.34/132-wrt300nv2_mac_fix.patch
+++ b/target/linux/ixp4xx/patches-2.6.34/132-wrt300nv2_mac_fix.patch
@@ -26,17 +26,18 @@
                .rxq            = 3,
                .txreadyq       = 20,
        }, {
-@@ -111,6 +114,9 @@ static struct platform_device *wrt300nv2
+@@ -110,6 +113,10 @@ static struct platform_device *wrt300nv2
+ 
  static void __init wrt300nv2_init(void)
  {
-       ixp4xx_sys_init();
 +      uint8_t __iomem *f;
 +      int offset = 0;
 +      int i;
++
+       ixp4xx_sys_init();
  
        wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-@@ -119,6 +125,32 @@ static void __init wrt300nv2_init(void)
+@@ -119,6 +126,32 @@ static void __init wrt300nv2_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
  
        platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));

diff --git a/target/linux/ixp4xx/patches-2.6.35/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-2.6.35/132-wrt300nv2_mac_fix.patch
index cc891e2..381cc5b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.35/132-wrt300nv2_mac_fix.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/132-wrt300nv2_mac_fix.patch
@@ -26,17 +26,18 @@
                .rxq            = 3,
                .txreadyq       = 20,
        }, {
-@@ -111,6 +114,9 @@ static struct platform_device *wrt300nv2
+@@ -110,6 +113,10 @@ static struct platform_device *wrt300nv2
+ 
  static void __init wrt300nv2_init(void)
  {
-       ixp4xx_sys_init();
 +      uint8_t __iomem *f;
 +      int offset = 0;
 +      int i;
++
+       ixp4xx_sys_init();
  
        wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-       wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
-@@ -119,6 +125,32 @@ static void __init wrt300nv2_init(void)
+@@ -119,6 +126,32 @@ static void __init wrt300nv2_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
  
        platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));