diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-11-03 23:32:20 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-11-03 23:32:20 -0400 |
| commit | 3983138c017b6aeab6ce3dbb1e9afbe80bdac496 (patch) | |
| tree | 9fdcddfdb8ada91504c90e2551ba6a565ade7325 /arch/arm/mach-at91/Makefile.boot | |
| parent | ed5f886d16369fed5a69d96b8e85777c47206de1 (diff) | |
| parent | 02aac316abf436a7529d46a71f7083f9f9ef4b49 (diff) | |
| download | blackbird-op-linux-3983138c017b6aeab6ce3dbb1e9afbe80bdac496.tar.gz blackbird-op-linux-3983138c017b6aeab6ce3dbb1e9afbe80bdac496.zip | |
Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'arch/arm/mach-at91/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-at91/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot index 9ab5a3e5f4f1..8ddafadfdc7d 100644 --- a/arch/arm/mach-at91/Makefile.boot +++ b/arch/arm/mach-at91/Makefile.boot @@ -16,3 +16,5 @@ else params_phys-y := 0x20000100 initrd_phys-y := 0x20410000 endif + +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb usb_a9g20.dtb |
