android_kernel_motorola_sm6225/arch/arm/plat-omap/include/plat
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
blizzard.h omap: Checkpatch cleanup for blizzard.h 2010-03-11 14:50:00 -08:00
board-ams-delta.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-sx1.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-voiceblue.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board.h omap: Move omap2 FS USB platform init code into mach-omap2/usb-fs.c 2010-07-05 16:31:29 +03:00
clkdev.h
clkdev_omap.h Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
clock.h OMAP: clock: fix configuration of J-Type DPLLs to work for OMAP3 and OMAP4 2010-12-21 21:31:43 -07:00
common.h OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files 2010-12-21 20:01:55 -07:00
cpu.h omap2/3: Update revision identification 2010-10-01 16:35:24 -07:00
display.h OMAP: DSS2: Use dss_features framework on DSS2 code 2010-10-22 23:21:04 +03:00
dma-44xx.h omap4: Add auto-generated irq and dma headers 2010-02-23 14:02:52 -08:00
dma.h OMAP: DMA: Convert DMA library into platform driver 2010-12-20 18:38:31 -08:00
dmtimer.h OMAP: mach-omap2: Fix static declaration warnings 2010-10-08 09:57:40 -07:00
dsp.h omap: add dsp platform device 2010-10-05 12:05:11 -07:00
flash.h omap: convert boards to use physmap-flash 2010-02-15 10:03:32 -08:00
fpga.h omap1: Fix innovator FPGA init for multi-omap 2010-12-20 18:48:16 -08:00
gpio-switch.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
gpio.h OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 2010-12-21 21:05:16 -07:00
gpmc-smc91x.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
gpmc-smsc911x.h ARM: OMAP3LOGIC: Add generic smsc911x support when connected to GPMC 2010-09-28 11:39:18 -07:00
gpmc.h OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds 2010-12-21 12:05:25 -08:00
hardware.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
hwa742.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
i2c.h OMAP3: hwmod: add I2C hwmods for OMAP3430 2010-11-09 09:29:13 -08:00
io.h OMAP2+: io: split omap2_init_common_hw() 2010-12-21 19:55:11 -07:00
iommu.h OMAP: iommu: create new api to set valid da range 2010-12-15 11:29:10 -06:00
iommu2.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
iovmm.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
irda.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
irqs-44xx.h omap4: Add auto-generated irq and dma headers 2010-02-23 14:02:52 -08:00
irqs.h omap1: Use asm_irq_flags for entry-macro.S 2010-12-09 15:49:23 -08:00
keypad.h Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
l4_3xxx.h OMAP3: hwmod: add I2C hwmods for OMAP3430 2010-11-09 09:29:13 -08:00
lcd_mipid.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
led.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
mailbox.h OMAP: mailbox: add notification support for multiple readers 2010-12-02 05:43:16 -06:00
mcbsp.h Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2010-10-25 13:46:56 -07:00
mcspi.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
memory.h ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() 2011-01-03 11:27:43 +00:00
menelaus.h omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 2010-02-15 09:27:01 -08:00
mmc.h Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus 2010-10-08 10:19:53 -07:00
multi.h omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2 2010-05-03 17:21:31 -07:00
mux.h Merge branch 'devel-misc' into omap-for-linus 2010-08-02 14:23:38 +03:00
nand.h omap3 nand: cleanup virtual address usages 2010-08-02 15:30:38 +03:00
nokia-dsi-panel.h OMAP: DSS2: Add Nokia DSI command mode panel configuration struct 2010-08-03 15:18:48 +03:00
omap-alsa.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap-pm.h OMAP: PM noop: implement context loss count for non-omap_devices 2010-12-21 21:31:55 -07:00
omap-serial.h omap: serial: Change device name: omap-hsuart -> omap_uart 2010-12-20 17:53:04 -08:00
omap4-keypad.h Input: omap4-keypad - use platform device helpers 2010-10-13 07:49:25 -07:00
omap7xx.h omap1: Add 7xx clocks and pin muxes for SPI 2010-01-08 10:29:05 -08:00
omap16xx.h omap: Clean the serial port defines 2010-02-15 08:48:53 -08:00
omap24xx.h OMAP2420: CTRL: fix OMAP242X_CTRL_REGADDR macro 2010-10-08 11:40:17 -06:00
omap34xx.h crypto: omap - Updates omap sham device related platform code 2010-05-03 11:10:03 +08:00
omap44xx.h arm: omap4: add USBHOST and related base addresses 2010-12-01 02:36:08 +05:30
omap730.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap850.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap1510.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap_device.h OMAP: PM: implement context loss count APIs 2010-12-21 21:31:55 -07:00
omap_hwmod.h omap2+: Add support for hwmod specific muxing of devices 2010-12-22 18:42:35 -08:00
onenand.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
param.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
prcm.h OMAP3: control/PM: move padconf save code to mach-omap2/control.c 2010-12-21 21:05:16 -07:00
sdrc.h OMAP: mach-omap2: Fix static declaration warnings 2010-10-08 09:57:40 -07:00
serial.h omap2+: Add struct omap_board_data and use it for platform level serial init 2010-12-22 18:42:35 -08:00
smartreflex.h OMAP3: PM: Adding smartreflex driver support. 2010-12-22 14:31:35 -08:00
smp.h ARM: SMP: remove smp_mpidr.h 2010-12-20 15:09:11 +00:00
sram.h OMAP2+: use global values for the SRAM PA addresses 2010-12-21 14:45:56 -08:00
system.h omap: pass the reboot command to the boot loader 2010-03-11 14:50:00 -08:00
tc.h omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
timex.h
uncompress.h OMAP3: Devkit8000: Add DEBUG_LL support 2010-12-21 17:53:01 -08:00
usb.h usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 2010-12-10 14:43:51 +02:00
voltage.h OMAP4: Adding voltage driver support 2010-12-22 14:31:47 -08:00
vram.h ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB 2010-07-27 08:48:23 +01:00
vrfb.h OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB 2010-10-22 23:21:06 +03:00