diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-07 12:36:48 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-16 08:37:37 +0100 |
commit | 784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3 (patch) | |
tree | e28d645f519b5bd86df3ae6f5d06704b1755f09b /arch/arm/mach-mx5/efika.h | |
parent | ARM i.MX5: remove unnecessary includes from board files (diff) | |
download | linux-784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3.tar.xz linux-784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3.zip |
ARM i.MX: Merge i.MX5 support into mach-imx
This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx
and adjusts the Makefile/Kconfig entries in a way that it's possible
to compile i.MX5 together with i.MX3/6.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
Diffstat (limited to 'arch/arm/mach-mx5/efika.h')
-rw-r--r-- | arch/arm/mach-mx5/efika.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-mx5/efika.h b/arch/arm/mach-mx5/efika.h deleted file mode 100644 index 014aa985faae..000000000000 --- a/arch/arm/mach-mx5/efika.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _EFIKA_H -#define _EFIKA_H - -#define EFIKA_WLAN_EN IMX_GPIO_NR(2, 16) -#define EFIKA_WLAN_RESET IMX_GPIO_NR(2, 10) -#define EFIKA_USB_PHY_RESET IMX_GPIO_NR(2, 9) - -void __init efika_board_common_init(void); - -#endif |