diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/usb/atm/xusbatm.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/usb/atm/xusbatm.c')
| -rw-r--r-- | drivers/usb/atm/xusbatm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c index 42d6823b82b3..70125c6d3be4 100644 --- a/drivers/usb/atm/xusbatm.c +++ b/drivers/usb/atm/xusbatm.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | ******************************************************************************/ | 20 | ******************************************************************************/ |
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/netdevice.h> /* FIXME: required by linux/etherdevice.h */ | ||
| 24 | #include <linux/etherdevice.h> /* for random_ether_addr() */ | 23 | #include <linux/etherdevice.h> /* for random_ether_addr() */ |
| 25 | 24 | ||
| 26 | #include "usbatm.h" | 25 | #include "usbatm.h" |