aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 17:23:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 17:23:01 -0400
commitee1a8d402e7e204d57fb108aa40003b6d1633036 (patch)
tree3abf4be63d11bbbd04c89bd668a17533f942b911 /arch/arm/mach-at91/Makefile
parent40e71e7015ab85c8606f50736525220948a3b24b (diff)
parent9686bb66a4c50e43ffee903a9fc62237ee2de1e6 (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-at91/Makefile')
-rw-r--r--arch/arm/mach-at91/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 07e89b4db7e7..3b0a9538093c 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o
52obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o 52obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
53obj-$(CONFIG_MACH_CAM60) += board-cam60.o 53obj-$(CONFIG_MACH_CAM60) += board-cam60.o
54obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o 54obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o
55obj-$(CONFIG_MACH_USB_A9260) += board-usb-a926x.o
56obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o 55obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o
57obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o 56obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o
58obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o 57obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o
@@ -64,7 +63,6 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o
64 63
65# AT91SAM9263 board-specific support 64# AT91SAM9263 board-specific support
66obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o 65obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
67obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o
68 66
69# AT91SAM9RL board-specific support 67# AT91SAM9RL board-specific support
70obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o 68obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o
@@ -77,7 +75,6 @@ obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
77obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o 75obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
78obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o 76obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o
79obj-$(CONFIG_MACH_GSIA18S) += board-gsia18s.o board-stamp9g20.o 77obj-$(CONFIG_MACH_GSIA18S) += board-gsia18s.o board-stamp9g20.o
80obj-$(CONFIG_MACH_USB_A9G20) += board-usb-a926x.o
81 78
82# AT91SAM9260/AT91SAM9G20 board-specific support 79# AT91SAM9260/AT91SAM9G20 board-specific support
83obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o 80obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o