diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-04 00:58:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 00:04:16 +0200 |
| commit | dfbaa7d8a4056436b6a170625d64986ebb648486 (patch) | |
| tree | 61713fd79502bc395a7e13798e90e7ddba9f92aa | |
| parent | [PATCH] USB: free allocated memory on io_edgeport startup memory failure (diff) | |
| download | linux-dfbaa7d8a4056436b6a170625d64986ebb648486.tar.xz linux-dfbaa7d8a4056436b6a170625d64986ebb648486.zip | |
[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 @@ #include <linux/platform_device.h> #include <asm/mach-au1x00/au1000.h> -#ifndef CONFIG_SOC_AU1200 -#error "this Alchemy chip doesn't have EHCI" -#else /* Au1200 */ - #define USB_HOST_CONFIG (USB_MSR_BASE + USB_MSR_MCFG) #define USB_MCFG_PFEN (1<<31) #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"); #define PLATFORM_DRIVER ehci_fsl_driver #endif -#ifdef CONFIG_SOC_AU1X00 +#ifdef CONFIG_SOC_AU1200 #include "ehci-au1xxx.c" #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver #endif |