diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:53:45 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:53:45 +0100 |
| commit | 2818b19102fdc414248f772c46af176d36520ae7 (patch) | |
| tree | 0a6f666ab02c12f308de6352a74c8fbc86e36343 /arch/arm/mach-shmobile/Makefile | |
| parent | Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest (diff) | |
| parent | ARM: mach-shmobile: mackerel: Add USB1(Host) support (diff) | |
| download | linux-2818b19102fdc414248f772c46af176d36520ae7.tar.xz linux-2818b19102fdc414248f772c46af176d36520ae7.zip | |
Merge branch 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index efd89136f0d7..2d8328d5dd57 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -23,3 +23,4 @@ obj-$(CONFIG_MACH_G3EVM) += board-g3evm.o obj-$(CONFIG_MACH_G4EVM) += board-g4evm.o obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o +obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o |