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/host/sl811_cs.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/host/sl811_cs.c')
| -rw-r--r-- | drivers/usb/host/sl811_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index 302aa1ec312f..54f554e0f0ad 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <pcmcia/cisreg.h> | 27 | #include <pcmcia/cisreg.h> |
| 28 | #include <pcmcia/ds.h> | 28 | #include <pcmcia/ds.h> |
| 29 | 29 | ||
| 30 | #include <linux/usb_sl811.h> | 30 | #include <linux/usb/sl811.h> |
| 31 | 31 | ||
| 32 | MODULE_AUTHOR("Botond Botyanszki"); | 32 | MODULE_AUTHOR("Botond Botyanszki"); |
| 33 | MODULE_DESCRIPTION("REX-CFU1U PCMCIA driver for 2.6"); | 33 | MODULE_DESCRIPTION("REX-CFU1U PCMCIA driver for 2.6"); |