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/mach-bcmring/Makefile.boot | |
parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) |
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/mach-bcmring/Makefile.boot')
-rw-r--r-- | arch/arm/mach-bcmring/Makefile.boot | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-bcmring/Makefile.boot b/arch/arm/mach-bcmring/Makefile.boot deleted file mode 100644 index aef2467757fa..000000000000 --- a/arch/arm/mach-bcmring/Makefile.boot +++ /dev/null @@ -1,6 +0,0 @@ -# Address where decompressor will be written and eventually executed. -# -# default to SDRAM -zreladdr-y += $(CONFIG_BCM_ZRELADDR) -params_phys-y := 0x00000800 - |