From 0a2ee7bb2e178faf6cad90c1f667092804823c83 Mon Sep 17 00:00:00 2001 From: Julie Zhu Date: Mon, 27 Jul 2009 11:45:32 -0600 Subject: [PATCH] --- yaml --- r: 165939 b: refs/heads/master c: afc26cb39e1e74c87a1b5eb013ead2590b91489c h: refs/heads/master i: 165937: feb48f8f62638fd6a3c362c48398ff9e7886ec98 165935: a8c029535e7567c78bf16b53944322137bf2abb2 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/Kconfig | 1 + trunk/arch/microblaze/include/asm/io.h | 3 +++ trunk/drivers/usb/Kconfig | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b588b794bc2d..2ffb6a52d458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5b37092aae1edaa638b156b16d09854ad6a1ec0 +refs/heads/master: afc26cb39e1e74c87a1b5eb013ead2590b91489c diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig index 2db722d80d4d..bbd8327f1890 100644 --- a/trunk/arch/microblaze/Kconfig +++ b/trunk/arch/microblaze/Kconfig @@ -6,6 +6,7 @@ mainmenu "Linux/Microblaze Kernel Configuration" config MICROBLAZE def_bool y select HAVE_LMB + select USB_ARCH_HAS_EHCI select ARCH_WANT_OPTIONAL_GPIOLIB config SWAP diff --git a/trunk/arch/microblaze/include/asm/io.h b/trunk/arch/microblaze/include/asm/io.h index 7c3ec13b44d8..fc9997b73c09 100644 --- a/trunk/arch/microblaze/include/asm/io.h +++ b/trunk/arch/microblaze/include/asm/io.h @@ -210,6 +210,9 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size, #define in_be32(a) __raw_readl((const void __iomem __force *)(a)) #define in_be16(a) __raw_readw(a) +#define writel_be(v, a) out_be32((__force unsigned *)a, v) +#define readl_be(a) in_be32((__force unsigned *)a) + /* * Little endian */ diff --git a/trunk/drivers/usb/Kconfig b/trunk/drivers/usb/Kconfig index dcd49f1e96d0..b35025ae4303 100644 --- a/trunk/drivers/usb/Kconfig +++ b/trunk/drivers/usb/Kconfig @@ -22,7 +22,6 @@ config USB_ARCH_HAS_HCD default y if PCMCIA && !M32R # sl811_cs default y if ARM # SL-811 default y if SUPERH # r8a66597-hcd - default y if MICROBLAZE default PCI # many non-PCI SOC chips embed OHCI