diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/usb/host/isp116x.h | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
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; |