Merge branch 'depends/omap2_dss' into next/cleanup

Browse source

Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.

Conflicts:
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-rx51.c

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

...

This commit is contained in:

Arnd Bergmann 2011-10-31 23:17:39 +01:00

parent d6bb0f2770 3e28189038

commit 034ee29912

70 changed files with 7111 additions and 5213 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

78

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

View file

7

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

View file

208

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

View file

6

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

View file

34

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

View file

6

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

View file

10

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

View file

42

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

View file

8

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

View file

123

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

View file

8

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

View file

7

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

View file

2

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

View file

40

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

View file

18

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

View file

8

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

View file

7

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

View file

25

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

View file

60

arch/arm/mach-omap2/display.c

View file

11

arch/arm/mach-omap2/twl-common.c

View file

18

drivers/media/video/omap/omap_vout.c

View file

29

drivers/video/omap/Kconfig

View file

8

drivers/video/omap/Makefile

View file

203

drivers/video/omap/lcd_2430sdp.c

View file

136

drivers/video/omap/lcd_apollon.c

View file

117

drivers/video/omap/lcd_h4.c

View file

201

drivers/video/omap/lcd_ldp.c

View file

130

drivers/video/omap/lcd_omap3beagle.c

View file

193

drivers/video/omap/lcd_omap3evm.c

View file

180

drivers/video/omap/lcd_overo.c

View file

28

drivers/video/omap2/displays/Kconfig

View file

3

drivers/video/omap2/displays/Makefile

View file

363

drivers/video/omap2/displays/panel-dvi.c

View file

113

drivers/video/omap2/displays/panel-generic-dpi.c

View file

747

drivers/video/omap2/displays/panel-n8x0.c

View file

594

drivers/video/omap2/displays/panel-picodlp.c

View file

288

drivers/video/omap2/displays/panel-picodlp.h

View file

121

drivers/video/omap2/displays/panel-taal.c

View file

2

drivers/video/omap2/dss/Kconfig

View file

2

drivers/video/omap2/dss/Makefile

View file

4

drivers/video/omap2/dss/core.c

View file

1692

drivers/video/omap2/dss/dispc.c

View file

57

drivers/video/omap2/dss/dispc.h

View file

31

drivers/video/omap2/dss/display.c

View file

28

drivers/video/omap2/dss/dpi.c

View file

951

drivers/video/omap2/dss/dsi.c

View file

18

drivers/video/omap2/dss/dss.c

View file

158

drivers/video/omap2/dss/dss.h

View file

130

drivers/video/omap2/dss/dss_features.c

View file

17

drivers/video/omap2/dss/dss_features.h

View file

1260

drivers/video/omap2/dss/hdmi.c

View file

68

drivers/video/omap2/dss/hdmi_omap4_panel.c → drivers/video/omap2/dss/hdmi_panel.c

View file

191

drivers/video/omap2/dss/manager.c

View file

122

drivers/video/omap2/dss/overlay.c

View file

45

drivers/video/omap2/dss/rfbi.c

View file

19

drivers/video/omap2/dss/sdi.c

View file

138

drivers/video/omap2/dss/ti_hdmi.h

View file

1239

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

View file

394

drivers/video/omap2/dss/hdmi.h → drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h

View file

27

drivers/video/omap2/dss/venc.c

View file

2

drivers/video/omap2/omapfb/Kconfig

View file

134

drivers/video/omap2/omapfb/omapfb-main.c

View file

6

drivers/video/omap2/omapfb/omapfb-sysfs.c

View file

37

include/video/omap-panel-dvi.h

View file

15

include/video/omap-panel-n8x0.h

View file

8

include/video/omap-panel-nokia-dsi.h

View file

23

include/video/omap-panel-picodlp.h

View file

100

include/video/omapdss.h

View file