original_kernel/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
board-ams-delta.h
board-sx1.h
board-voiceblue.h
board.h
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
display.h
dma-44xx.h
dma.h
dmtimer.h
dsp.h
flash.h
fpga.h
gpio-switch.h
gpio.h OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 2010-12-21 21:05:16 -07:00
gpmc-smc91x.h
gpmc-smsc911x.h
gpmc.h
hardware.h
hwa742.h
i2c.h
io.h OMAP2+: io: split omap2_init_common_hw() 2010-12-21 19:55:11 -07:00
iommu.h
iommu2.h
iovmm.h
irda.h
irqs-44xx.h
irqs.h
keypad.h Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
l4_3xxx.h
lcd_mipid.h
led.h
mailbox.h
mcbsp.h
mcspi.h
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
mmc.h
multi.h
mux.h
nand.h
nokia-dsi-panel.h
omap-alsa.h
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
omap4-keypad.h
omap7xx.h
omap16xx.h
omap24xx.h
omap34xx.h
omap44xx.h
omap730.h
omap850.h
omap1510.h
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
param.h
prcm.h OMAP3: control/PM: move padconf save code to mach-omap2/control.c 2010-12-21 21:05:16 -07:00
sdrc.h
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
sram.h
system.h
tc.h
timex.h
uncompress.h OMAP3: Devkit8000: Add DEBUG_LL support 2010-12-21 17:53:01 -08:00
usb.h
voltage.h OMAP4: Adding voltage driver support 2010-12-22 14:31:47 -08:00
vram.h
vrfb.h