aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-12-01 08:51:13 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-01 11:56:43 -0500
commit58a0cd7887cd689ae42540dd12b3b3131abfbe6c (patch)
tree3ede7aef3e67bc9fee868129f8eac18a4d7378e1 /drivers/usb/host
parent022cbd7376fcdf030fe821636f1c910c45a9356a (diff)
[ARM] 3963/1: AT91: Update configuration files
A number of configuration file changes. These are mainly to replace references to ARCH_AT91RM9200 and ARCH_AT91SAM9261 with the common/generic ARCH_AT91. That way we don't need to mention every specific AT91 processor explicitly. Also adds the configuration option for AT91SAM9260-EK and AT91SAM9261-EK boards. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ohci-hcd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index ea4714e557e4..4776b3bdf9c8 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -935,7 +935,7 @@ MODULE_LICENSE ("GPL");
935#include "ohci-ppc-soc.c" 935#include "ohci-ppc-soc.c"
936#endif 936#endif
937 937
938#if defined(CONFIG_ARCH_AT91RM9200) || defined(CONFIG_ARCH_AT91SAM9261) 938#ifdef CONFIG_ARCH_AT91
939#include "ohci-at91.c" 939#include "ohci-at91.c"
940#endif 940#endif
941 941
@@ -952,8 +952,7 @@ MODULE_LICENSE ("GPL");
952 || defined (CONFIG_ARCH_EP93XX) \ 952 || defined (CONFIG_ARCH_EP93XX) \
953 || defined (CONFIG_SOC_AU1X00) \ 953 || defined (CONFIG_SOC_AU1X00) \
954 || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \ 954 || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \
955 || defined (CONFIG_ARCH_AT91RM9200) \ 955 || defined (CONFIG_ARCH_AT91) \
956 || defined (CONFIG_ARCH_AT91SAM9261) \
957 || defined (CONFIG_ARCH_PNX4008) \ 956 || defined (CONFIG_ARCH_PNX4008) \
958 ) 957 )
959#error "missing bus glue for ohci-hcd" 958#error "missing bus glue for ohci-hcd"