Merge branch 'omap/headers4' into next/drivers

Browse source

This avoids merge conflicts between the omap header changes and the gpmc
updates.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-11-15 17:18:30 +01:00

parent c9b1c7b34a 6ba54ab4a4

commit cf1fb2dfa7

344 changed files with 9937 additions and 9289 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

1

arch/arm/Kconfig

View file

3

arch/arm/mach-omap1/Makefile

View file

1

arch/arm/mach-omap1/board-ams-delta.c

View file

9

arch/arm/mach-omap1/board-fsample.c

View file

1

arch/arm/mach-omap1/board-generic.c

View file

5

arch/arm/mach-omap1/board-h2-mmc.c

View file

6

arch/arm/mach-omap1/board-h2.c

View file

3

arch/arm/mach-omap1/board-h3-mmc.c

View file

5

arch/arm/mach-omap1/board-h3.c

View file

3

arch/arm/mach-omap1/board-htcherald.c

View file

30

arch/arm/mach-omap1/board-innovator.c

View file

5

arch/arm/mach-omap1/board-nokia770.c

View file

3

arch/arm/mach-omap1/board-osk.c

View file

6

arch/arm/mach-omap1/board-palmte.c

View file

8

arch/arm/mach-omap1/board-palmtt.c

View file

6

arch/arm/mach-omap1/board-palmz71.c

View file

9

arch/arm/mach-omap1/board-perseus2.c

View file

3

arch/arm/mach-omap1/board-sx1-mmc.c

View file

6

arch/arm/mach-omap1/board-sx1.c

View file

3

arch/arm/mach-omap1/board-voiceblue.c

View file

507

arch/arm/mach-omap1/clock.c

View file

178

arch/arm/mach-omap1/clock.h

View file

16

arch/arm/mach-omap1/clock_data.c

View file

5

arch/arm/mach-omap1/common.h

View file

14

arch/arm/mach-omap1/devices.c

View file

9

arch/arm/mach-omap1/dma.c

View file

83

arch/arm/mach-omap1/dma.h

View file

2

arch/arm/mach-omap1/flash.c

View file

4

arch/arm/mach-omap1/fpga.c

View file

52

arch/arm/mach-omap1/fpga.h

View file

2

arch/arm/mach-omap1/gpio15xx.c

View file

2

arch/arm/mach-omap1/gpio16xx.c

View file

2

arch/arm/mach-omap1/gpio7xx.c

View file

64

arch/arm/mach-omap1/i2c.c

View file

2

arch/arm/mach-omap1/id.c

View file

2

arch/arm/mach-omap1/include/mach/debug-macro.S

View file

2

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

View file

3

arch/arm/mach-omap1/include/mach/gpio.h

View file

9

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

View file

2

arch/arm/mach-omap1/include/mach/memory.h

View file

113

arch/arm/mach-omap1/include/mach/omap1510.h

View file

53

arch/arm/mach-omap1/include/mach/serial.h

View file

229

arch/arm/mach-omap1/include/mach/soc.h

View file

0

arch/arm/plat-omap/include/plat/tc.h → arch/arm/mach-omap1/include/mach/tc.h

View file

121

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

View file

5

arch/arm/mach-omap1/io.c

View file

3

arch/arm/mach-omap1/iomap.h

View file

2

arch/arm/mach-omap1/irq.c

View file

4

arch/arm/mach-omap1/lcd_dma.c

View file

5

arch/arm/mach-omap1/mcbsp.c

View file

18

arch/arm/mach-omap1/mmc.h

View file

2

arch/arm/mach-omap1/opp_data.c

View file

10

arch/arm/mach-omap1/pm.c

View file

3

arch/arm/mach-omap1/pm_bus.c

View file

1

arch/arm/mach-omap1/serial.c

View file

2

arch/arm/mach-omap1/sleep.S

View file

4

arch/arm/mach-omap1/soc.h

View file

76

arch/arm/mach-omap1/sram-init.c

View file

7

arch/arm/mach-omap1/sram.h

View file

1

arch/arm/mach-omap1/timer32k.c

View file

6

arch/arm/mach-omap1/usb.c

View file

4

arch/arm/mach-omap2/Makefile

View file

2

arch/arm/mach-omap2/am35xx-emac.c

View file

4

arch/arm/mach-omap2/board-2430sdp.c

View file

6

arch/arm/mach-omap2/board-3430sdp.c

View file

3

arch/arm/mach-omap2/board-3630sdp.c

View file

4

arch/arm/mach-omap2/board-4430sdp.c

View file

1

arch/arm/mach-omap2/board-am3517crane.c

View file

2

arch/arm/mach-omap2/board-am3517evm.c

View file

4

arch/arm/mach-omap2/board-apollon.c

View file

10

arch/arm/mach-omap2/board-cm-t35.c

View file

6

arch/arm/mach-omap2/board-cm-t3517.c

View file

11

arch/arm/mach-omap2/board-devkit8000.c

View file

52

arch/arm/mach-omap2/board-flash.c

View file

8

arch/arm/mach-omap2/board-flash.h

View file

8

arch/arm/mach-omap2/board-h4.c

View file

9

arch/arm/mach-omap2/board-igep0020.c

View file

9

arch/arm/mach-omap2/board-ldp.c

View file

5

arch/arm/mach-omap2/board-n8x0.c

View file

16

arch/arm/mach-omap2/board-omap3beagle.c

View file

11

arch/arm/mach-omap2/board-omap3evm.c

View file

7

arch/arm/mach-omap2/board-omap3logic.c

View file

4

arch/arm/mach-omap2/board-omap3pandora.c

View file

3

arch/arm/mach-omap2/board-omap3stalker.c

View file

11

arch/arm/mach-omap2/board-omap3touchbook.c

View file

6

arch/arm/mach-omap2/board-omap4panda.c

View file

11

arch/arm/mach-omap2/board-overo.c

View file

9

arch/arm/mach-omap2/board-rm680.c

View file

7

arch/arm/mach-omap2/board-rx51-peripherals.c

View file

8

arch/arm/mach-omap2/board-rx51.c

View file

3

arch/arm/mach-omap2/board-ti8168evm.c

View file

4

arch/arm/mach-omap2/board-zoom-debugboard.c

View file

3

arch/arm/mach-omap2/board-zoom-display.c

View file

3

arch/arm/mach-omap2/board-zoom-peripherals.c

View file

8

arch/arm/mach-omap2/board-zoom.c

View file

0

arch/arm/mach-omap2/include/mach/board-zoom.h → arch/arm/mach-omap2/board-zoom.h

View file

1

arch/arm/mach-omap2/clkt2xxx_apll.c

View file

2

arch/arm/mach-omap2/clkt2xxx_dpll.c

View file

6

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

View file

2

arch/arm/mach-omap2/clkt2xxx_osc.c

View file

Some files were not shown because too many files have changed in this diff Show more