fix some compile warnings with 2.6.32

SVN-Revision: 19435

diff --git a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
index f59792a530702fd832bf3dc224b107c1c686a272..6370c99835449dd2e4c3511fa7cdfbfed06ea386 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
@@ -149,7 +149,6 @@
 +
 +static void __init tw5334_init(void)
 +{
-+      DECLARE_MAC_BUF(mac_buf);
 +      uint8_t __iomem *f;
 +      int i;
 +
@@ -180,10 +179,11 @@
 +#endif
 +              iounmap(f);
 +      }
-+      printk(KERN_INFO "TW-533-4: Using MAC address %s for port 0\n",
-+              print_mac(mac_buf, tw5334_plat_eth[0].hwaddr));
-+      printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n",
-+              print_mac(mac_buf, tw5334_plat_eth[1].hwaddr));
++
++      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 0\n",
++              tw5334_plat_eth[0].hwaddr);
++      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n",
++              tw5334_plat_eth[1].hwaddr);
 +}
 +
 +#ifdef CONFIG_MACH_TW5334

diff --git a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
index c3791c6902dc390c44d69f22c5d0fc2695b37e38..2ec8b5e444d10e6cf54700d6dbe1e3f8beaacf6f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
@@ -410,7 +410,7 @@
 +
 +static struct memory_accessor *at24_mem_acc;
 +
-+static int at24_setup(struct memory_accessor *mem_acc, void *context)
++static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];
 +      char model[6];
@@ -421,6 +421,7 @@
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
++
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
@@ -430,7 +431,6 @@
 +              cambria_info = cambria_find_board_info(model);
 +      }
 +
-+      return 0;
 +}
 +
 +static struct at24_platform_data cambria_eeprom_info = {

diff --git a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
index ca8cae12ca50f1ece38574c415b6d776ca54fc40..c298834275eba6e38f6a86dabed7728a953c5f1e 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
@@ -159,7 +159,7 @@
 +
 +static struct memory_accessor *at24_mem_acc;
 +
-+static int at24_setup(struct memory_accessor *mem_acc, void *context)
++static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +      char mac_addr[ETH_ALEN];
 +      char model[6];
@@ -170,6 +170,7 @@
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +              memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
++
 +      if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +              memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +      }
@@ -179,7 +180,6 @@
 +              avila_info = avila_find_board_info(model);
 +      }
 +
-+      return 0;
 +}
 +
 +static struct at24_platform_data avila_eeprom_info = {