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/usbatm.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/usbatm.c')
| -rw-r--r-- | drivers/usb/atm/usbatm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 546249843b8e..a38701c742c3 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
| @@ -1039,7 +1039,7 @@ static void usbatm_tasklet_schedule(unsigned long data) | |||
| 1039 | tasklet_schedule((struct tasklet_struct *) data); | 1039 | tasklet_schedule((struct tasklet_struct *) data); |
| 1040 | } | 1040 | } |
| 1041 | 1041 | ||
| 1042 | static inline void usbatm_init_channel(struct usbatm_channel *channel) | 1042 | static void usbatm_init_channel(struct usbatm_channel *channel) |
| 1043 | { | 1043 | { |
| 1044 | spin_lock_init(&channel->lock); | 1044 | spin_lock_init(&channel->lock); |
| 1045 | INIT_LIST_HEAD(&channel->list); | 1045 | INIT_LIST_HEAD(&channel->list); |