diff options
| author | Peter Chen <peter.chen@freescale.com> | 2011-07-08 08:49:53 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:18:37 +0800 |
| commit | 50047624d2850cc8ea2abd2df43eb835cec3f733 (patch) | |
| tree | 0952c22729b623ad339eec3de9f54d31c6f974f3 | |
| parent | 8f5d24aa44881a7007ffffc4e310a2c0c9d7ef4f (diff) | |
ENGR00152842 mx5x-usb: fix build error
As well as some warnings for compiling
Fix the build error reported by Alan Tull, the error message is:
arch/arm/mach-mx5/usb_dr.c: In function 'mx5_usb_dr_init':
arch/arm/mach-mx5/usb_dr.c:309: error: implicit
declaration of function 'machine_is_mx53_loco'
The below warning message output when compiling mx5x kenrel:
arch/arm/plat-mxc/include/mach/arc_otg.h:36:7:
warning: "CONFIG_ARCH_MX6" is not defined
Signed-off-by: Peter Chen <peter.chen@freescale.com>
| -rwxr-xr-x | arch/arm/mach-mx5/usb_dr.c | 1 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/include/mach/arc_otg.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c index 25e63caea945..36e9eac07624 100755 --- a/arch/arm/mach-mx5/usb_dr.c +++ b/arch/arm/mach-mx5/usb_dr.c @@ -19,6 +19,7 @@ #include <mach/arc_otg.h> #include <mach/hardware.h> #include <linux/delay.h> +#include <asm/mach-types.h> #include "usb.h" static int usbotg_init_ext(struct platform_device *pdev); static void usbotg_uninit_ext(struct platform_device *pdev); diff --git a/arch/arm/plat-mxc/include/mach/arc_otg.h b/arch/arm/plat-mxc/include/mach/arc_otg.h index 16cfae398da2..d35a29ba10d8 100755 --- a/arch/arm/plat-mxc/include/mach/arc_otg.h +++ b/arch/arm/plat-mxc/include/mach/arc_otg.h @@ -30,10 +30,7 @@ extern void __iomem *imx_otg_base; #define USB_OTGREGS_BASE (OTG_BASE_ADDR + 0x000) #define USB_H1REGS_BASE (OTG_BASE_ADDR + 0x200) #define USB_H2REGS_BASE (OTG_BASE_ADDR + 0x400) -#if defined CONFIG_ARCH_MX5 -#define USB_H3REGS_BASE (OTG_BASE_ADDR + 0x600) -#define USB_OTHERREGS_BASE (OTG_BASE_ADDR + 0x800) -#elif CONFIG_ARCH_MX6 +#if (defined CONFIG_ARCH_MX5 | defined CONFIG_ARCH_MX6) #define USB_H3REGS_BASE (OTG_BASE_ADDR + 0x600) #define USB_OTHERREGS_BASE (OTG_BASE_ADDR + 0x800) #else |