diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/host/isp116x.h | |
parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
download | blackbird-op-linux-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.gz blackbird-op-linux-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/host/isp116x.h')
-rw-r--r-- | drivers/usb/host/isp116x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h index 58873470dcf5..c6fec96785fe 100644 --- a/drivers/usb/host/isp116x.h +++ b/drivers/usb/host/isp116x.h @@ -253,7 +253,6 @@ static const int cc_to_error[16] = { struct isp116x { spinlock_t lock; - struct work_struct rh_resume; void __iomem *addr_reg; void __iomem *data_reg; |