diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-09-12 03:15:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-09-12 03:15:46 -0700 |
| commit | d684348da0f3718e599ccaa66b4c91d9bdfd2b10 (patch) | |
| tree | 335285f60ec74d9225d2cdd652b4d7dfb844e715 /include/linux | |
| parent | 5f7bc42ba73506292d91367ac3ec6b5b16e2b4db (diff) | |
| parent | b7420b57b24c85aa7bb0add10bafe63419fb96c2 (diff) | |
Merge bk://linux-bt.bkbits.net/bt-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c99e53fed30e..0175e588f33b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -28,8 +28,6 @@ #include <linux/if.h> #include <linux/if_ether.h> #include <linux/if_packet.h> -#include <linux/device.h> -#include <linux/percpu.h> #include <asm/atomic.h> #include <asm/cache.h> @@ -37,6 +35,8 @@ #ifdef __KERNEL__ #include <linux/config.h> +#include <linux/device.h> +#include <linux/percpu.h> struct divert_blk; struct vlan_group; |