Russell King 0ff66f0c7a Merge branch 'pxa-plat' into devel ...

* pxa-plat: (53 commits)
  [ARM] 4762/1: Basic support for Toradex Colibri module
  [ARM] pxa: fix mci_init functions returning -1
  [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
  [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
  [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
  [ARM] 4745/1: pcm027: default configuration
  [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
  [NET] smc91x: Make smc91x use IRQ resource trigger flags
  [ARM] pxa: add default config for littleton
  [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
  [ARM] 4664/1: Add basic support for HTC Magician PDA phones
  [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
  [ARM] pxa: skip registers saving/restoring if entering standby mode
  [ARM] pxa: fix PXA27x resume
  [ARM] pxa: Avoid fiddling with CKEN register on suspend
  [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
  [ARM] pxa: Add zylonite MFP wakeup configurations
  [ARM] pxa: program MFPs for low power mode when suspending
  [ARM] pxa: make MFP configuration processor independent
  [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
  ...

Conflicts:

	arch/arm/mach-pxa/ssp.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2008-01-28 13:21:38 +00:00

..

akita.h

[ARM] 3149/1: SharpSL: Add Akita (SL-C1000) machine support

2005-11-12 18:53:48 +00:00

audio.h

[ALSA] Fix snd_xxx_t typedefs

2006-03-22 10:23:39 +01:00

bitfield.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cm-x270.h

[ARM] 4576/1: CM-X270 machine support

2007-10-15 18:53:57 +01:00

colibri.h

[ARM] 4762/1: Basic support for Toradex Colibri module

2008-01-28 13:13:27 +00:00

corgi.h

[ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix

2008-01-28 13:13:25 +00:00

debug-macro.S

[ARM] Collect 8250-based debug implementations together

2006-03-21 22:05:57 +00:00

dma.h

[ARM] 4576/1: CM-X270 machine support

2007-10-15 18:53:57 +01:00

entry-macro.S

[ARM] 4440/1: PXA: enable the checking of ICIP2 for IRQs

2007-07-12 14:28:14 +01:00

gpio.h

[ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()

2007-10-15 18:53:55 +01:00

hardware.h

[ARM] pxa: silence warnings from cpu_is_xxx() macros

2008-01-10 12:33:54 +00:00

i2c.h

i2c-pxa: Add polling transfer

2008-01-27 18:14:50 +01:00

idp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

io.h

[ARM] 3631/1: Remove legacy __mem_isa() definitions

2006-06-24 10:34:48 +01:00

irda.h

[ARM] 2897/2: PXA2xx IRDA support

2005-10-28 16:39:33 +01:00

irqs.h

[ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module

2008-01-28 13:13:20 +00:00

littleton.h

[ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)

2008-01-28 13:13:17 +00:00

lpd270.h

[ARM] 3417/1: add support for logicpd pxa270 card engine

2006-03-28 21:08:13 +01:00

lubbock.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

magician.h

[ARM] 4664/1: Add basic support for HTC Magician PDA phones

2008-01-28 13:13:16 +00:00

mainstone.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

memory.h

[ARM] 4576/1: CM-X270 machine support

2007-10-15 18:53:57 +01:00

mfp-pxa3xx.h

[ARM] pxa: make MFP configuration processor independent

2008-01-26 15:07:56 +00:00

mfp-pxa300.h

[ARM] pxa: introduce a new file mfp-pxa3xx.h for common pin configurations

2008-01-26 15:07:56 +00:00

mfp-pxa320.h

[ARM] pxa: introduce a new file mfp-pxa3xx.h for common pin configurations

2008-01-26 15:07:56 +00:00

mfp.h

[ARM] pxa: make MFP configuration processor independent

2008-01-26 15:07:56 +00:00

mmc.h

[ARM] pxa: mmc: add 3rd host controller support for pxa310

2008-01-26 15:07:53 +00:00

mtd-xip.h

[MTD] XIP cleanup

2005-07-07 16:50:16 +02:00

ohci.h

[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget

2006-06-08 22:44:07 +01:00

pcm027.h

[ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module

2008-01-28 13:13:20 +00:00

pcm990_baseboard.h

[ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270

2008-01-28 13:13:24 +00:00

pm.h

PM: Move definition of struct pm_ops to suspend.h

2007-10-18 14:37:18 -07:00

poodle.h

[ARM] 3594/1: Poodle: Add touchscreen support + other updates

2006-06-19 20:46:05 +01:00

pxa2xx_spi.h

[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()

2008-01-26 15:07:52 +00:00

pxa2xx-regs.h

[ARM] pxa: move memory controller registers into pxa2xx-regs.h

2008-01-26 15:07:54 +00:00

pxa3xx-regs.h

[ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme

2008-01-26 15:07:56 +00:00

pxa27x_keyboard.h

Input: add support for PXA27x keyboard controller

2007-03-16 00:58:52 -04:00

pxa-regs.h

[ARM] pxa: move memory controller registers into pxa2xx-regs.h

2008-01-26 15:07:54 +00:00

pxafb.h

pxafb: Add support for other palette formats

2007-10-16 09:43:15 -07:00

regs-ssp.h

[ARM] pxa: use __raw_writel()/__raw_readl() for ssp_xxxx()

2008-01-26 15:07:51 +00:00

sharpsl.h

[ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix

2008-01-28 13:13:25 +00:00

spitz.h

[ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix

2008-01-28 13:13:25 +00:00

ssp.h

[ARM] pxa: define "struct ssp_device" and add ssp_request()/ssp_free()

2008-01-26 15:07:51 +00:00

system.h

[ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds

2006-06-19 19:57:12 +01:00

timex.h

[ARM] pxa: PXA3xx base support

2007-10-15 18:53:43 +01:00

tosa.h

[ARM] 3088/1: PXA: Add machine support for the Sharp SL-6000x series of PDAs

2005-11-06 14:27:52 +00:00

trizeps4.h

[ARM] 3666/1: TRIZEPS4 [1/5] core

2006-06-29 16:25:37 +01:00

udc.h

USB: pxa2xx_udc: use generic gpio layer

2007-07-12 16:34:42 -07:00

uncompress.h

[ARM] 4718/1: Fix redefinition warnings in PXA uncompressor code

2008-01-26 15:07:52 +00:00

vmalloc.h

[PATCH] ARM: cleanup vmalloc start/offset macros

2005-05-03 12:20:29 +01:00

zylonite.h

[ARM] pxa: mmc: add 1st host controller support for pxa3xx

2008-01-26 15:07:53 +00:00