diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/usb/host/isp116x.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
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] = { | |||
| 253 | 253 | ||
| 254 | struct isp116x { | 254 | struct isp116x { |
| 255 | spinlock_t lock; | 255 | spinlock_t lock; |
| 256 | struct work_struct rh_resume; | ||
| 257 | 256 | ||
| 258 | void __iomem *addr_reg; | 257 | void __iomem *addr_reg; |
| 259 | void __iomem *data_reg; | 258 | void __iomem *data_reg; |