diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:31:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:31:37 +0100 |
| commit | 3a768d04639307dbebbbbc8f4216e3a06bc602d7 (patch) | |
| tree | c4d9f24f559929202e1cce10691021c54e80953e /arch/arm/mach-spear6xx/Kconfig | |
| parent | b83e139caf1f7230f274bf9b4706ea3fab550a72 (diff) | |
| parent | bcf3e72eff584136600a51a5b30ef7a794664d19 (diff) | |
| download | op-kernel-dev-3a768d04639307dbebbbbc8f4216e3a06bc602d7.zip op-kernel-dev-3a768d04639307dbebbbbc8f4216e3a06bc602d7.tar.gz | |
Merge branch 'spear/multiplatform' into next/multiplatform
The spear platform has been cleaned up a lot by Viresh
Kumar, and is relatively easy to convert to multiplatform,
getting us one more step closer to having all ARMv7
platforms included.
I originally did this before 3.8 but merging it never
worked out so far, mostly because of conflicts against
patches in the DMA tree, but also because I did not push very
hard for these.
* spear/multiplatform:
ARM: spear: enable spear13xx in multi_v7_defconfig
ARM: spear: fix build error in restart.c
ARM: spear: use multiplatform configuration options.
ARM: spear: rename duplicate pl080_plat_data
ARM: spear: make clock driver independent of headers
ARM: spear: move generic.h and pl080.h into private dir
ARM: spear: move all files to mach-spear
ARM: spear: move spear.h and misc_regs.h into plat-spear
ARM: spear: merge Kconfig files
ARM: spear: make spear3xx/6xx mach/spear.h files identical
ARM: spear: move identical headers to plat-spear/include/mach
ARM: spear: unify mach/generic.h and mach/irqs.h
ARM: spear13xx: make mach/dma.h local
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-spear6xx/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig deleted file mode 100644 index 339f397..0000000 --- a/arch/arm/mach-spear6xx/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -# -# SPEAr6XX Machine configuration file -# - -config MACH_SPEAR600 - def_bool y - depends on ARCH_SPEAR6XX - select USE_OF - help - Supports ST SPEAr600 boards configured via the device-tree |
