mtd, ubi: set free_count to zero before walking through erase list

[oweals/u-boot.git] / drivers / usb / musb-new / musb_regs.h

diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
index 4dc9abbe02ccca4a4d9ae9d81769c8edc9d7949e..0f18dd7f7eecd0cc6f2a85343e9e29d40ebb82c8 100644 (file)
--- a/drivers/usb/musb-new/musb_regs.h
+++ b/drivers/usb/musb-new/musb_regs.h
@@ -434,7 +434,7 @@ static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
 
 static inline u8 musb_read_configdata(void __iomem *mbase)
 {
-#ifdef CONFIG_MACH_SUN8I_A33
+#if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T
        /* <Sigh> allwinner saves a reg, and we need to hardcode this */
        return 0xde;
 #else