diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
| commit | 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch) | |
| tree | ae51ca9e03b538a58c576e1fa79983ec31e22269 /arch/arm/boards/beagle/Makefile | |
| parent | c408a4ecbee60a9d512930972c09c6f9e365a671 (diff) | |
| parent | 893f30f614da5ed132265f5c4da767ec26a8edf5 (diff) | |
| download | barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/beagle/board.c
Diffstat (limited to 'arch/arm/boards/beagle/Makefile')
| -rw-r--r-- | arch/arm/boards/beagle/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boards/beagle/Makefile b/arch/arm/boards/beagle/Makefile index 01c7a259e9..3bee9a22ab 100644 --- a/arch/arm/boards/beagle/Makefile +++ b/arch/arm/boards/beagle/Makefile @@ -1,2 +1,3 @@ obj-y += board.o lwl-y += lowlevel.o +bbenv-y += defaultenv-beagle |