diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 02:18:25 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 02:18:25 +0400 |
| commit | 5ae13ef4e1045d6ec5d445947b42c839b9731bec (patch) | |
| tree | 8cc0d1409f254586cfe81fb08de061df45dbfa2e /arch/arm/configs/mvebu_defconfig | |
| parent | 01758fe655103338ca80b1cdf527d65fd20a4c0c (diff) | |
| parent | 5fb2038d61ce94e7c9224db2aaff5633ca224953 (diff) | |
| download | linux-5ae13ef4e1045d6ec5d445947b42c839b9731bec.tar.xz | |
Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
mvebu register map changes for v3.11
This series removes the hardcoded register base address for mvebu.
Depends:
- mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
- mvebu/cleanup (up to tags/cleanup-3.11-3)
* tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig
arm: mvebu: add another earlyprintk Kconfig option
arm: mvebu: don't hardcode the physical address for mvebu-mbus
arm: mvebu: don't hardcode a physical address in headsmp.S
arm: mvebu: remove hardcoded static I/O mapping
arm: mvebu: move cache and mvebu-mbus initialization later
arm: mvebu: avoid hardcoded virtual address in coherency code
arm: mvebu: remove dependency of SMP init on static I/O mapping
arm: mvebu: fix length of Ethernet registers area in .dtsi
arm: mvebu: fix length of SATA registers area in .dtsi
arm: mvebu: mark functions of armada-370-xp.c as static
ARM: mvebu: Remove init_irq declaration in machine description
ARM: Orion: Remove redundant init_dma_coherent_pool_size()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/mvebu_defconfig')
| -rw-r--r-- | arch/arm/configs/mvebu_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 804b1dae4330..731814e2c189 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -100,5 +100,3 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y |