diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /drivers/usb/host/ohci-hcd.c | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index a8160d65f32b..26bc47941d01 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -974,7 +974,7 @@ MODULE_LICENSE ("GPL"); | |||
| 974 | #define PCI_DRIVER ohci_pci_driver | 974 | #define PCI_DRIVER ohci_pci_driver |
| 975 | #endif | 975 | #endif |
| 976 | 976 | ||
| 977 | #ifdef CONFIG_SA1111 | 977 | #if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_SA1111) |
| 978 | #include "ohci-sa1111.c" | 978 | #include "ohci-sa1111.c" |
| 979 | #define SA1111_DRIVER ohci_hcd_sa1111_driver | 979 | #define SA1111_DRIVER ohci_hcd_sa1111_driver |
| 980 | #endif | 980 | #endif |