Merge branch 'pxa' into devel

Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
2026-09-26 18:16:26 +00:00 · 2008-07-13 12:05:49 +01:00 · 2008-07-13 12:05:49 +01:00 · 044e5f45e4
commit 044e5f45e4
parent f0006314d3 faf64ed496
136 changed files with 13523 additions and 7049 deletions
--- a/include/asm-arm/arch-pxa/audio.h
+++ b/include/asm-arm/arch-pxa/audio.h
--- a/include/asm-arm/arch-pxa/cm-x270.h
+++ b/include/asm-arm/arch-pxa/cm-x270.h
--- a/include/asm-arm/arch-pxa/eseries-gpio.h
+++ b/include/asm-arm/arch-pxa/eseries-gpio.h
--- a/include/asm-arm/arch-pxa/eseries-irq.h
+++ b/include/asm-arm/arch-pxa/eseries-irq.h
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
--- a/include/asm-arm/arch-pxa/irda.h
+++ b/include/asm-arm/arch-pxa/irda.h
--- a/include/asm-arm/arch-pxa/irqs.h
+++ b/include/asm-arm/arch-pxa/irqs.h
--- a/include/asm-arm/arch-pxa/mfp-pxa2xx.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa2xx.h
--- a/include/asm-arm/arch-pxa/mfp-pxa930.h
+++ b/include/asm-arm/arch-pxa/mfp-pxa930.h
--- a/include/asm-arm/arch-pxa/mfp.h
+++ b/include/asm-arm/arch-pxa/mfp.h
--- a/include/asm-arm/arch-pxa/palmtx.h
+++ b/include/asm-arm/arch-pxa/palmtx.h
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/arch-pxa/pxa25x-udc.h
+++ b/include/asm-arm/arch-pxa/pxa25x-udc.h
--- a/include/asm-arm/arch-pxa/pxa27x-udc.h
+++ b/include/asm-arm/arch-pxa/pxa27x-udc.h
--- a/include/asm-arm/arch-pxa/pxa2xx-gpio.h
+++ b/include/asm-arm/arch-pxa/pxa2xx-gpio.h
--- a/include/asm-arm/arch-pxa/pxa2xx-regs.h
+++ b/include/asm-arm/arch-pxa/pxa2xx-regs.h
--- a/include/asm-arm/arch-pxa/pxa2xx_spi.h
+++ b/include/asm-arm/arch-pxa/pxa2xx_spi.h
--- a/include/asm-arm/arch-pxa/pxa3xx_nand.h
+++ b/include/asm-arm/arch-pxa/pxa3xx_nand.h
--- a/include/asm-arm/arch-pxa/pxafb.h
+++ b/include/asm-arm/arch-pxa/pxafb.h
--- a/include/asm-arm/arch-pxa/regs-lcd.h
+++ b/include/asm-arm/arch-pxa/regs-lcd.h
--- a/include/asm-arm/arch-pxa/regs-ssp.h
+++ b/include/asm-arm/arch-pxa/regs-ssp.h
--- a/include/asm-arm/arch-pxa/system.h
+++ b/include/asm-arm/arch-pxa/system.h
--- a/include/asm-arm/arch-pxa/tosa.h
+++ b/include/asm-arm/arch-pxa/tosa.h
--- a/include/asm-arm/arch-pxa/tosa_bt.h
+++ b/include/asm-arm/arch-pxa/tosa_bt.h
--- a/include/asm-arm/arch-pxa/uncompress.h
+++ b/include/asm-arm/arch-pxa/uncompress.h
--- a/include/asm-arm/arch-pxa/zylonite.h
+++ b/include/asm-arm/arch-pxa/zylonite.h
--- a/include/asm-arm/mach/udc_pxa2xx.h
+++ b/include/asm-arm/mach/udc_pxa2xx.h
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
--- a/include/linux/mfd/tc6393xb.h
+++ b/include/linux/mfd/tc6393xb.h
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
--- a/include/linux/pwm_backlight.h
+++ b/include/linux/pwm_backlight.h
--- a/include/linux/smc91x.h
+++ b/include/linux/smc91x.h