linux/include/video
Linus Torvalds 9e4db1c3ee Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM platform updates from Russell King:
 "This covers platform stuff for platforms I have a direct interest in
  (iow, I have the hardware).  Essentially:
   - as we no longer support any other Acorn platforms other than RiscPC
     anymore, we can collect all that code into mach-rpc.
   - convert Acorn expansion card stuff to use IRQ allocation functions,
     and get rid of NO_IRQ from there.
   - cleanups to the ebsa110 platform to move some private stuff out of
     its header files.
   - large amount of SA11x0 updates:
   - conversion of private DMA implementation to DMA engine support
     (this actually gives us greater flexibility in drivers over the old
     API.)
   - re-worked ucb1x00 updates - convert to genirq, remove sa11x0
     dependencies, fix various minor issues
   - move platform specific sa11x0 framebuffer data into platform files
     in arch/arm instead of keeping this in the driver itself
   - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
     for SIR transmissions as well as FIR
   - rework sa1111 support for genirq, and irq allocation
   - fix sa1111 IRQ support so it works again
   - use sparse IRQ support

  After this, I have one more pull request remaining from my current
  set, which I think is going to be the most problematical as it
  generates 8 conflicts."

Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
Russell.

* 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
  ARM: 7343/1: sa11x0: convert to sparse IRQ
  ARM: 7342/2: sa1100: prepare for sparse irq conversion
  ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
  ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
  ARM: sa11x0: remove unused DMA controller definitions
  ARM: sa11x0: remove old SoC private DMA driver
  USB: sa1111: add hcd .reset method
  USB: sa1111: add OHCI shutdown methods
  USB: sa1111: reorganize ohci-sa1111.c
  USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
  USB: sa1111: sparse and checkpatch cleanups
  ARM: sa11x0: don't static map sa1111
  ARM: sa1111: use dev_err() rather than printk()
  ARM: sa1111: cleanup sub-device registration and unregistration
  ARM: sa1111: only setup DMA for DMA capable devices
  ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
  ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
  ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
  ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
  ARM: sa1111: delete unused physical GPIO register definitions
  ...
2012-03-27 18:17:02 -07:00
..
Kbuild
atmel_lcdc.h atmel_lcdfb: implement inverted contrast pwm 2011-03-22 16:23:44 +09:00
aty128.h
broadsheetfb.h
cirrus.h
cvisionppc.h
da8xx-fb.h
edid.h UAPI: Fix nested __KERNEL__ guards in video/edid.h 2011-12-13 09:26:45 +00:00
epson1355.h
exynos_dp.h video: support DP controller driver 2012-02-13 03:02:30 +00:00
exynos_mipi_dsim.h video: support MIPI-DSI controller driver 2012-02-13 03:02:03 +00:00
gbe.h
hecubafb.h
iga.h
ili9320.h
kyro.h Fix common misspellings 2011-03-31 11:26:23 -03:00
mach64.h
maxinefb.h
mbxfb.h
metronomefb.h
mipi_display.h
neomagic.h Fix common misspellings 2011-03-31 11:26:23 -03:00
newport.h Merge branch 'master' into for-next 2011-04-26 10:22:59 +02:00
omap-panel-dvi.h OMAP: DSS2: add panel-dvi driver 2011-09-30 16:16:48 +03:00
omap-panel-generic-dpi.h OMAP: DSS2: Move panel-generic-dpi.h to include/video/ 2011-05-11 14:08:51 +03:00
omap-panel-n8x0.h OMAPDSS: Add N800 panel driver 2011-09-30 16:17:30 +03:00
omap-panel-nokia-dsi.h OMAPDSS: Taal: remove external backlight support 2011-09-30 16:17:27 +03:00
omap-panel-picodlp.h OMAP: DSS2: Add picodlp panel driver 2011-09-14 18:08:23 +03:00
omapdss.h OMAPDSS: HDMI: PHY burnout fix 2012-01-26 13:51:36 +02:00
permedia2.h
platform_lcd.h
pm3fb.h
pmag-ba-fb.h
pmagb-b-fb.h
pxa168fb.h
radeon.h
s1d13xxxfb.h
sa1100fb.h FB: sa1100: remove global sa1100fb_.*_power function pointers 2012-02-21 11:56:19 +00:00
sgivw.h
sh_mipi_dsi.h fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info 2012-03-21 07:24:01 +00:00
sh_mobile_hdmi.h fbdev: sh_mobile_hdmi: Remove sh_mobile_hdmi_info lcd_chan field 2012-03-12 22:40:48 +01:00
sh_mobile_lcdc.h fbdev: sh_mobile_lcdc: Don't store copy of platform data 2012-03-12 22:41:12 +01:00
sh_mobile_meram.h fbdev: sh_mobile_meram: Remove unneeded sanity checks 2012-03-12 22:41:14 +01:00
sisfb.h Fix common misspellings 2011-03-31 11:26:23 -03:00
sstfb.h Fix common misspellings 2011-03-31 11:26:23 -03:00
tdfx.h
tgafb.h
trident.h
udlfb.h udlfb: fix hcd_buffer_free panic on unplug/replug 2012-03-01 17:46:27 -08:00
uvesafb.h
vga.h
w100fb.h