From 670b7360051c72c26d72960d6ca61327902eb77c Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 15 Aug 2010 05:39:31 +0000
Subject: [PATCH] ixp4xx: fix compiler warnings in wrt300nv2-setup.c
SVN-Revision: 22655
---
.../ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch | 9 +++++----
.../ixp4xx/patches-2.6.33/132-wrt300nv2_mac_fix.patch | 9 +++++----
.../ixp4xx/patches-2.6.34/132-wrt300nv2_mac_fix.patch | 9 +++++----
.../ixp4xx/patches-2.6.35/132-wrt300nv2_mac_fix.patch | 9 +++++----
4 files changed, 20 insertions(+), 16 deletions(-)
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 cc891e2482..381cc5b757 100644
--- 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 cc891e2482..381cc5b757 100644
--- 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 cc891e2482..381cc5b757 100644
--- 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 cc891e2482..381cc5b757 100644
--- 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));
--
GitLab