diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-27 02:05:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-27 02:05:54 -0800 |
commit | ce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch) | |
tree | 874b57409bad0c9620a431272e6bf5c94e270253 /include/linux/netdevice.h | |
parent | 8266d7127c1b0bdf924066c19c71be4d351e9583 (diff) | |
parent | 9e3bd9190800e8209b4a3e1d724c35f0738dcad2 (diff) | |
download | kernel_samsung_espresso10-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.zip kernel_samsung_espresso10-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.gz kernel_samsung_espresso10-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 682d025..7a2aea5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int rc) * used. */ -#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) +#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) # if defined(CONFIG_MAC80211_MESH) # define LL_MAX_HEADER 128 # else |