diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
| commit | c224cd316197132321869d859048f89da49c0162 (patch) | |
| tree | 275649e84cb143b3a389bf05c8416904b9da0dba /arch/arm/boards/phycard-i.MX27/Makefile | |
| parent | 3cbd92bf6e96d4274e3a4f6aeceaf51d5406a0a6 (diff) | |
| parent | cc66cf109b1d2ca40c180a87fd76c2099dff2d92 (diff) | |
| download | barebox-c224cd316197132321869d859048f89da49c0162.tar.gz barebox-c224cd316197132321869d859048f89da49c0162.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/dmo-mx6-realq7/lowlevel.c
Diffstat (limited to 'arch/arm/boards/phycard-i.MX27/Makefile')
| -rw-r--r-- | arch/arm/boards/phycard-i.MX27/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/phycard-i.MX27/Makefile b/arch/arm/boards/phycard-i.MX27/Makefile index bbff2893ff..34492bb127 100644 --- a/arch/arm/boards/phycard-i.MX27/Makefile +++ b/arch/arm/boards/phycard-i.MX27/Makefile @@ -1,3 +1,3 @@ -lwl-y += lowlevel_init.o +lwl-y += lowlevel.o obj-y += pca100.o |