diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-03 18:58:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:16 -0400 |
commit | dfbaa7d8a4056436b6a170625d64986ebb648486 (patch) | |
tree | 61713fd79502bc395a7e13798e90e7ddba9f92aa | |
parent | bfd5df3c0cf65bdf10a3a00baff036cb096140f6 (diff) |
[PATCH] USB: EHCI on non-Au1200 build fix
Including ehci-au1xxx.c on a non-Au1200 Alchemy only to have it throw
an error is stupid.
From: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/host/ehci-au1xxx.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index 0e444ab1930d..9b4697add313 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
@@ -16,10 +16,6 @@ | |||
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | #include <asm/mach-au1x00/au1000.h> | 17 | #include <asm/mach-au1x00/au1000.h> |
18 | 18 | ||
19 | #ifndef CONFIG_SOC_AU1200 | ||
20 | #error "this Alchemy chip doesn't have EHCI" | ||
21 | #else /* Au1200 */ | ||
22 | |||
23 | #define USB_HOST_CONFIG (USB_MSR_BASE + USB_MSR_MCFG) | 19 | #define USB_HOST_CONFIG (USB_MSR_BASE + USB_MSR_MCFG) |
24 | #define USB_MCFG_PFEN (1<<31) | 20 | #define USB_MCFG_PFEN (1<<31) |
25 | #define USB_MCFG_RDCOMB (1<<30) | 21 | #define USB_MCFG_RDCOMB (1<<30) |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 7d7c97cf9b2f..9b37e508ada3 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -897,7 +897,7 @@ MODULE_LICENSE ("GPL"); | |||
897 | #define PLATFORM_DRIVER ehci_fsl_driver | 897 | #define PLATFORM_DRIVER ehci_fsl_driver |
898 | #endif | 898 | #endif |
899 | 899 | ||
900 | #ifdef CONFIG_SOC_AU1X00 | 900 | #ifdef CONFIG_SOC_AU1200 |
901 | #include "ehci-au1xxx.c" | 901 | #include "ehci-au1xxx.c" |
902 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver | 902 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver |
903 | #endif | 903 | #endif |