diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 17:23:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 17:23:01 -0400 |
| commit | ee1a8d402e7e204d57fb108aa40003b6d1633036 (patch) | |
| tree | 3abf4be63d11bbbd04c89bd668a17533f942b911 /arch/arm/mach-shmobile/Makefile | |
| parent | 40e71e7015ab85c8606f50736525220948a3b24b (diff) | |
| parent | 9686bb66a4c50e43ffee903a9fc62237ee2de1e6 (diff) | |
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC device tree changes from Arnd Bergmann:
"These changes from 30 individual branches for the most part update
device tree files, but there are also a few source code changes that
have crept in this time, usually in order to atomically move over a
driver from using hardcoded data to DT probing.
A number of platforms change their DT files to use the C preprocessor,
which is causing a bit of churn, but that is hopefully only this once"
* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
ARM: at91: dt: rm9200ek: add spi support
ARM: at91: dt: rm9200: add spi support
ARM: at91/DT: at91sam9n12: add SPI DMA client infos
ARM: at91/DT: sama5d3: add SPI DMA client infos
ARM: at91/DT: fix SPI compatibility string
ARM: Kirkwood: Fix the internal register ranges translation
ARM: dts: bcm281xx: change comment to C89 style
ARM: mmc: bcm281xx SDHCI driver (dt mods)
ARM: nomadik: add the new clocks to the device tree
clk: nomadik: implement the Nomadik clocks properly
ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
ARM: dts: omap4-panda: Fix DVI EDID reads
ARM: dts: omap4-panda: Add USB Host support
arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
ARM: shmobile: irqpin: add a DT property to enable masking on parent
ARM: dts: AM43x EPOS EVM support
ARM: dts: OMAP5: Add bandgap DT entry
ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
...
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 76f1639c5945..6165a517f580 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
| @@ -44,6 +44,7 @@ obj-$(CONFIG_MACH_MARZEN) += board-marzen.o | |||
| 44 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o | 44 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
| 45 | obj-$(CONFIG_MACH_LAGER) += board-lager.o | 45 | obj-$(CONFIG_MACH_LAGER) += board-lager.o |
| 46 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o | 46 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
| 47 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o | ||
| 47 | obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o | 48 | obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o |
| 48 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o | 49 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o |
| 49 | obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o | 50 | obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o |