diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 01:29:54 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 01:29:54 +0000 |
| commit | 6b4b0de60b4d3e6f6ae69a9ee9dfb0cf9f25322f (patch) | |
| tree | 99dcfe0ffec867c6c721095b496c67df1def62c8 /target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch | |
| parent | 863bd9590a943b0ff9db01cd2226dfcd1c4c9419 (diff) | |
[ixp4xx] fix some compile warnings with 2.6.32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19435 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 ca8cae12c..c29883427 100644 --- 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 = { |