diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/usb/host/ehci-ps3.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/host/ehci-ps3.c')
| -rw-r--r-- | drivers/usb/host/ehci-ps3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 9c9da35abc6c..1ba9f9a8c308 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
| @@ -81,7 +81,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) | |||
| 81 | int result; | 81 | int result; |
| 82 | struct usb_hcd *hcd; | 82 | struct usb_hcd *hcd; |
| 83 | unsigned int virq; | 83 | unsigned int virq; |
| 84 | static u64 dummy_mask = DMA_32BIT_MASK; | 84 | static u64 dummy_mask = DMA_BIT_MASK(32); |
| 85 | 85 | ||
| 86 | if (usb_disabled()) { | 86 | if (usb_disabled()) { |
| 87 | result = -ENODEV; | 87 | result = -ENODEV; |