Merge branch 'bcmring/removal' into next/multiplatform

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2012-09-28 21:51:22 +02:00

parent e3a66aa33a 25e4b485fb

commit df69a4627e

57 changed files with 0 additions and 15472 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

MAINTAINERS

View file

14

arch/arm/Kconfig

View file

1

arch/arm/Makefile

View file

79

arch/arm/configs/bcmring_defconfig

View file

19

arch/arm/mach-bcmring/Kconfig

View file

8

arch/arm/mach-bcmring/Makefile

View file

6

arch/arm/mach-bcmring/Makefile.boot

View file

198

arch/arm/mach-bcmring/arch.c

View file

223

arch/arm/mach-bcmring/clock.c

View file

33

arch/arm/mach-bcmring/clock.h

View file

227

arch/arm/mach-bcmring/core.c

View file

31

arch/arm/mach-bcmring/core.h

View file

3

arch/arm/mach-bcmring/csp/Makefile

View file

1

arch/arm/mach-bcmring/csp/chipc/Makefile

View file

779

arch/arm/mach-bcmring/csp/chipc/chipcHw.c

View file

283

arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c

View file

125

arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c

View file

64

arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c

View file

1

arch/arm/mach-bcmring/csp/dmac/Makefile

View file

916

arch/arm/mach-bcmring/csp/dmac/dmacHw.c

View file

1017

arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c

View file

1

arch/arm/mach-bcmring/csp/tmr/Makefile

View file

576

arch/arm/mach-bcmring/csp/tmr/tmrHw.c

View file

1518

arch/arm/mach-bcmring/dma.c

View file

593

arch/arm/mach-bcmring/dma_device.c

View file

51

arch/arm/mach-bcmring/include/mach/cfg_global.h

View file

63

arch/arm/mach-bcmring/include/mach/csp/cap.h

View file

409

arch/arm/mach-bcmring/include/mach/csp/cap_inline.h

View file

1123

arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h

View file

1682

arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h

View file

530

arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h

View file

872

arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h

View file

596

arch/arm/mach-bcmring/include/mach/csp/dmacHw.h

View file

145

arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h

View file

406

arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h

View file

73

arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h

View file

246

arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h

View file

101

arch/arm/mach-bcmring/include/mach/csp/mm_addr.h

View file

147

arch/arm/mach-bcmring/include/mach/csp/mm_io.h

View file

115

arch/arm/mach-bcmring/include/mach/csp/reg.h

View file

100

arch/arm/mach-bcmring/include/mach/csp/secHw_def.h

View file

79

arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h

View file

263

arch/arm/mach-bcmring/include/mach/csp/tmrHw.h

View file

82

arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h

View file

630

arch/arm/mach-bcmring/include/mach/dma.h

View file

76

arch/arm/mach-bcmring/include/mach/entry-macro.S

View file

57

arch/arm/mach-bcmring/include/mach/hardware.h

View file

132

arch/arm/mach-bcmring/include/mach/irqs.h

View file

67

arch/arm/mach-bcmring/include/mach/memory_settings.h

View file

66

arch/arm/mach-bcmring/include/mach/reg_nand.h

View file

237

arch/arm/mach-bcmring/include/mach/reg_umi.h

View file

77

arch/arm/mach-bcmring/include/mach/timer.h

View file

25

arch/arm/mach-bcmring/include/mach/timex.h

View file

43

arch/arm/mach-bcmring/include/mach/uncompress.h

View file

126

arch/arm/mach-bcmring/irq.c

View file

60

arch/arm/mach-bcmring/mm.c

View file

61

arch/arm/mach-bcmring/timer.c

View file