android_kernel_xiaomi_sm7250/arch/arm/mach-sa1100/include/mach
Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
assabet.h
badge4.h
bitfield.h
cerf.h
collie.h
debug-macro.S
dma.h
entry-macro.S
gpio.h
h3600_gpio.h
h3600.h
hardware.h [ARM] cputype: separate definitions, use them 2008-09-01 12:06:23 +01:00
ide.h
io.h
irqs.h
jornada720.h [ARM] 5255/1: Update jornada ssp to remove build errors/warnings 2008-09-18 12:29:09 +01:00
lart.h
mcp.h
memory.h [ARM] mm: switch SA1100 to use sparsemem 2008-10-01 21:03:21 +01:00
mtd-xip.h
neponset.h
reset.h
SA-1100.h [ARM] cputype: separate definitions, use them 2008-09-01 12:06:23 +01:00
SA-1101.h
SA-1111.h
shannon.h
simpad.h
system.h
timex.h
uncompress.h
vmalloc.h