diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/usb/host/isp1760-hcd.h | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.h')
| -rw-r--r-- | drivers/usb/host/isp1760-hcd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h index 4377277667d9..a9daea587962 100644 --- a/drivers/usb/host/isp1760-hcd.h +++ b/drivers/usb/host/isp1760-hcd.h | |||
| @@ -135,7 +135,6 @@ typedef void (packet_enqueue)(struct usb_hcd *hcd, struct isp1760_qh *qh, | |||
| 135 | * indicate the most "atypical" case, so that a devflags of 0 is | 135 | * indicate the most "atypical" case, so that a devflags of 0 is |
| 136 | * a sane default configuration. | 136 | * a sane default configuration. |
| 137 | */ | 137 | */ |
| 138 | #define ISP1760_FLAG_PORT1_DIS 0x00000001 /* Port 1 disabled */ | ||
| 139 | #define ISP1760_FLAG_BUS_WIDTH_16 0x00000002 /* 16-bit data bus width */ | 138 | #define ISP1760_FLAG_BUS_WIDTH_16 0x00000002 /* 16-bit data bus width */ |
| 140 | #define ISP1760_FLAG_OTG_EN 0x00000004 /* Port 1 supports OTG */ | 139 | #define ISP1760_FLAG_OTG_EN 0x00000004 /* Port 1 supports OTG */ |
| 141 | #define ISP1760_FLAG_ANALOG_OC 0x00000008 /* Analog overcurrent */ | 140 | #define ISP1760_FLAG_ANALOG_OC 0x00000008 /* Analog overcurrent */ |