diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:51:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:51:38 +0200 |
| commit | df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e (patch) | |
| tree | 8f7587ab9a24a3c04afe842c3a7d51cb2c31a1cc /arch/arm/Makefile | |
| parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
| parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) | |
| download | linux-3.10-df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e.tar.gz linux-3.10-df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e.tar.bz2 linux-3.10-df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e.zip | |
Merge branch 'bcmring/removal' into next/multiplatform
The removal of bcmring has non-obvious commits with the way the
multiplatform configuration works, so merge it in here.
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1c974cf9db1..770da51242c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -137,7 +137,6 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_BCM2835) += bcm2835 -machine-$(CONFIG_ARCH_BCMRING) += bcmring machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx machine-$(CONFIG_ARCH_DAVINCI) += davinci |