1
0
Fork 0
alistair23-linux/arch/arm/configs
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
..
assabet_defconfig [ARM] Add PM_LEGACY defaults 2006-11-26 16:39:00 +00:00
at91cap9adk_defconfig [ARM] 4765/1: [AT91] AT91CAP9A-DK board support 2008-01-26 15:01:14 +00:00
at91rm9200dk_defconfig [ARM] Merge individual ARM sub-trees 2006-12-07 23:07:26 +00:00
at91rm9200ek_defconfig [ARM] Merge individual ARM sub-trees 2006-12-07 23:07:26 +00:00
at91sam9rlek_defconfig [ARM] 4371/1: AT91: Support for Atmel AT91SAM9RL-EK development board 2007-05-11 21:07:59 +01:00
at91sam9260ek_defconfig [ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ 2007-01-24 11:59:53 +00:00
at91sam9261ek_defconfig [ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ 2007-01-24 11:59:53 +00:00
at91sam9263ek_defconfig [ARM] 4146/1: AT91: Support for AT91SAM9263-EK board. 2007-02-08 14:55:25 +00:00
ateb9200_defconfig [ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200 2007-02-16 13:03:56 +00:00
badge4_defconfig i2c: Delete the i2c-isa pseudo bus driver 2007-07-19 14:25:20 -04:00
carmeva_defconfig [ARM] 3956/1: AT91: Carmeva board update 2006-12-01 13:53:57 +00:00
cerfcube_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
clps7500_defconfig i2c: Delete the i2c-isa pseudo bus driver 2007-07-19 14:25:20 -04:00
cm_x270_defconfig [ARM] 4576/1: CM-X270 machine support 2007-10-15 18:53:57 +01:00
colibri_defconfig [ARM] 4762/1: Basic support for Toradex Colibri module 2008-01-28 13:13:27 +00:00
collie_defconfig [ARM] remove reference to non-existent MTD_OBSOLETE_CHIPS 2008-01-26 14:50:02 +00:00
corgi_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
csb337_defconfig [ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200 2007-02-16 13:03:56 +00:00
csb637_defconfig [ARM] 4148/1: AT91: Physically mapped flash on CSB337 and CSB637 boards. 2007-02-08 14:55:28 +00:00
ebsa110_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
edb7211_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
em_x270_defconfig [ARM] 4475/2: EM-x270 board support 2007-07-20 17:45:15 +01:00
ep93xx_defconfig [ARM] 4060/1: update several ARM defconfigs 2006-12-19 21:04:38 +00:00
eseries_pxa_defconfig [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs. 2008-01-28 13:13:13 +00:00
footbridge_defconfig i2c: Delete the i2c-isa pseudo bus driver 2007-07-19 14:25:20 -04:00
fortunet_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
h3600_defconfig [ARM] Add PM_LEGACY defaults 2006-11-26 16:39:00 +00:00
h7201_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
h7202_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
hackkit_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
integrator_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
iop13xx_defconfig [ARM] 4708/1: iop: update defconfigs for 2.6.24 2008-01-26 14:37:57 +00:00
iop32x_defconfig [ARM] 4708/1: iop: update defconfigs for 2.6.24 2008-01-26 14:37:57 +00:00
iop33x_defconfig [ARM] 4708/1: iop: update defconfigs for 2.6.24 2008-01-26 14:37:57 +00:00
ixp4xx_defconfig [ARM] 4311/1: ixp4xx: add KIXRP435 platform 2007-04-21 20:51:55 +01:00
ixp23xx_defconfig [ARM] 4060/1: update several ARM defconfigs 2006-12-19 21:04:38 +00:00
ixp2000_defconfig [ARM] 4060/1: update several ARM defconfigs 2006-12-19 21:04:38 +00:00
jornada720_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
kafa_defconfig [ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200 2007-02-16 13:03:56 +00:00
kb9202_defconfig [ARM] Merge individual ARM sub-trees 2006-12-07 23:07:26 +00:00
ks8695_defconfig [ARM] 4333/2: KS8695: Micrel Development board 2007-05-11 22:02:55 +01:00
lart_defconfig [ARM] Add PM_LEGACY defaults 2006-11-26 16:39:00 +00:00
littleton_defconfig [ARM] pxa: add default config for littleton 2008-01-28 13:13:18 +00:00
lpd7a400_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
lpd7a404_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
lpd270_defconfig [ARM] 4060/1: update several ARM defconfigs 2006-12-19 21:04:38 +00:00
lubbock_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
lusl7200_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
mainstone_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
msm_defconfig [ARM] msm: board file for MACH_HALIBUT (QCT MSM7200A) 2008-01-26 14:39:14 +00:00
mx1ads_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
neponset_defconfig i2c: Delete the i2c-isa pseudo bus driver 2007-07-19 14:25:20 -04:00
netwinder_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
netx_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
ns9xxx_defconfig [ARM] 4211/1: Provide a defconfig for ns9xxx 2007-02-17 20:05:48 +00:00
omap_h2_1610_defconfig ARM: OMAP: Update omap h2 defconfig 2007-09-20 18:34:50 -07:00
omap_osk_5912_defconfig ARM: OMAP: Add omap osk defconfig 2007-09-20 18:34:51 -07:00
onearm_defconfig [ARM] 4060/1: update several ARM defconfigs 2006-12-19 21:04:38 +00:00
orion_defconfig [ARM] Orion: add support for QNAP TS-109/TS-209 2008-01-26 15:04:03 +00:00
pcm027_defconfig [ARM] 4745/1: pcm027: default configuration 2008-01-28 13:13:22 +00:00
picotux200_defconfig i2c: Delete the i2c-isa pseudo bus driver 2007-07-19 14:25:20 -04:00
pleb_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
pnx4008_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
pxa255-idp_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
realview-smp_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
realview_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
rpc_defconfig [ARM] rpc: update defconfig 2007-08-06 16:48:49 +01:00
s3c2410_defconfig [ARM] 4518/1: S3C: Rename watchdog configuration options 2007-07-22 16:44:38 +01:00
shannon_defconfig [ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs 2006-01-09 13:32:56 +00:00
shark_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
simpad_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
spitz_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
trizeps4_defconfig [ARM] 4362/1: trizeps4 update 2007-05-11 17:19:20 +01:00
versatile_defconfig [ARM] Remove DEBUG_WAITQ 2006-11-30 12:24:47 +00:00
zylonite_defconfig [ARM] 4636/1: pxa: add default configuration for zylonite 2007-10-31 15:21:48 +00:00