diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:35 +0200 |
| commit | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (patch) | |
| tree | a08ff0d2f8282854a8b1177f04e89cee57d65258 /arch/arm/boards/crystalfontz-cfa10036 | |
| parent | a3cd9a7ebe2c21bd96542c0f840eb92208f7cec6 (diff) | |
| parent | 65708cdb047363084b5b1a70b168043c6bc28bad (diff) | |
| download | barebox-d8b30e6c3823bfe50c3e060aab39b0fab2de933f.tar.gz barebox-d8b30e6c3823bfe50c3e060aab39b0fab2de933f.tar.xz | |
Merge branch 'for-next/mxs'
Conflicts:
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
Diffstat (limited to 'arch/arm/boards/crystalfontz-cfa10036')
| -rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index fcb7057c26..522d2d783d 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -23,6 +23,7 @@ #include <init.h> #include <mci.h> #include <io.h> +#include <net.h> #include <sizes.h> #include <mach/clock.h> @@ -93,6 +94,9 @@ static int cfa10036_devices_init(void) add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, SZ_8K, IORESOURCE_MEM, &mci_pdata); + add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, SZ_8K, + IORESOURCE_MEM, NULL); + return 0; } device_initcall(cfa10036_devices_init); |