diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/usb/host/isp116x.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
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 b91e2edd9c5c..595b90a99848 100644 --- a/drivers/usb/host/isp116x.h +++ b/drivers/usb/host/isp116x.h | |||
| @@ -270,7 +270,6 @@ struct isp116x { | |||
| 270 | u32 rhdesca; | 270 | u32 rhdesca; |
| 271 | u32 rhdescb; | 271 | u32 rhdescb; |
| 272 | u32 rhstatus; | 272 | u32 rhstatus; |
| 273 | u32 rhport[2]; | ||
| 274 | 273 | ||
| 275 | /* async schedule: control, bulk */ | 274 | /* async schedule: control, bulk */ |
| 276 | struct list_head async; | 275 | struct list_head async; |