diff options
| author | David S. Miller | 2010-02-27 11:05:54 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-02-27 11:05:54 +0100 |
| commit | ce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch) | |
| tree | 874b57409bad0c9620a431272e6bf5c94e270253 /include/linux/netdevice.h | |
| parent | net: Delete isa-skeleton net driver (diff) | |
| parent | b43: fall back gracefully to PIO mode after fatal DMA errors (diff) | |
| download | kernel-qcow2-linux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.gz kernel-qcow2-linux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.tar.xz kernel-qcow2-linux-ce300c7ffa61165f9bfd16e511ee0cd4114977ab.zip | |
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 682d02521bbc..7a2aea56f195 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 |