mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:54:36 +02:00
[ixp4xx] fix some compile warnings with 2.6.32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19435 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
863bd9590a
commit
6b4b0de60b
@ -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
|
||||
|
@ -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 = {
|
||||
|
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user