diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2005-09-27 15:59:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-27 15:59:43 -0700 |
| commit | 2fab35d78f32fc107e1af4b1ec23f557fa20d911 (patch) | |
| tree | d9380be1b80e53ea2308f72bba43f0f527fec947 /include/linux/if_ether.h | |
| parent | 520d1b830a93086c1f9e969d98f7ef01f0356493 (diff) | |
| download | kernel_samsung_tuna-2fab35d78f32fc107e1af4b1ec23f557fa20d911.zip kernel_samsung_tuna-2fab35d78f32fc107e1af4b1ec23f557fa20d911.tar.gz kernel_samsung_tuna-2fab35d78f32fc107e1af4b1ec23f557fa20d911.tar.bz2 | |
[NET]: Fix GCC4 compile error: sysctl in linux/if_ether.h
The following is generated when compiling a
recent (2.6.14-rc2-git5) kernel configured for
ARM, with GCC4.
CC init/main.o
In file included from include/linux/netdevice.h:29,
from include/net/sock.h:48,
from init/main.c:50:
include/linux/if_ether.h:114: error: array type has incomplete element type
It seems that if CONFIG_SYSCTL is not set, then
the compiler will throw an error due to the definition
of the ether_table[] array
Attached is a solution to the problem
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index fc2d4c8..d21c305 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -111,7 +111,9 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb) return (struct ethhdr *)skb->mac.raw; } +#ifdef CONFIG_SYSCTL extern struct ctl_table ether_table[]; #endif +#endif #endif /* _LINUX_IF_ETHER_H */ |