qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 10:45:11 +02:00
Code

[ixp4xx] fix some compile warnings with 2.6.32

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19435 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2010-01-31 01:29:54 +00:00
parent 863bd9590a
commit 6b4b0de60b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
View File

@ -149,7 +149,6 @@
+ +
+static void __init tw5334_init(void) +static void __init tw5334_init(void)
+{ +{
+ DECLARE_MAC_BUF(mac_buf);
+ uint8_t __iomem *f; + uint8_t __iomem *f;
+ int i; + int i;
+ +
@ -180,10 +179,11 @@
+#endif +#endif
+ iounmap(f); + 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 %pM for port 0\n",
+ printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n", + tw5334_plat_eth[0].hwaddr);
+ print_mac(mac_buf, tw5334_plat_eth[1].hwaddr)); + printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n",
+ tw5334_plat_eth[1].hwaddr);
+} +}
+ +
+#ifdef CONFIG_MACH_TW5334 +#ifdef CONFIG_MACH_TW5334

4
target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
View File

@ -410,7 +410,7 @@
+ +
+static struct memory_accessor *at24_mem_acc; +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 mac_addr[ETH_ALEN];
+ char model[6]; + char model[6];
@ -421,6 +421,7 @@
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
+ memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
+
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
+ memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
@ -430,7 +431,6 @@
+ cambria_info = cambria_find_board_info(model); + cambria_info = cambria_find_board_info(model);
+ } + }
+ +
+ return 0;
+} +}
+ +
+static struct at24_platform_data cambria_eeprom_info = { +static struct at24_platform_data cambria_eeprom_info = {

4
target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
View File

@ -159,7 +159,7 @@
+ +
+static struct memory_accessor *at24_mem_acc; +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 mac_addr[ETH_ALEN];
+ char model[6]; + char model[6];
@ -170,6 +170,7 @@
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
+ memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
+
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
+ memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
@ -179,7 +180,6 @@
+ avila_info = avila_find_board_info(model); + avila_info = avila_find_board_info(model);
+ } + }
+ +
+ return 0;
+} +}
+ +
+static struct at24_platform_data avila_eeprom_info = { +static struct at24_platform_data avila_eeprom_info = {