From: Linus Torvalds Date: Mon, 19 Feb 2007 21:18:39 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.21-rc1~75 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=59b8175c771040afcd4ad67022b0cc80c216b866;p=linux-2.6-omap-h63xx.git 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: (117 commits) [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports [ARM] 4140/1: AACI stability add ac97 timeout and retries [ARM] 4139/1: AACI record support [ARM] 4138/1: AACI: multiple channel support for IRQ handling [ARM] 4211/1: Provide a defconfig for ns9xxx [ARM] 4210/1: base for new machine type "NetSilicon NS9360" [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM [ARM] 4221/1: S3C2443: DMA support [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev [ARM] 4219/1: S3C2443: DMA source definitions [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443 [ARM] 4217/1: S3C24XX: remove the dma channel show at startup [ARM] 4090/2: avoid clash between PXA and SA1111 defines [ARM] 4216/1: add .gitignore entries for ARM specific files [ARM] 4214/2: S3C2410: Add Armzone QT2410 [ARM] 4215/1: s3c2410 usb device: per-platform vbus_draw [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos [ARM] 4137/1: Add kexec support [ARM] 4201/1: SMP barriers pair needed for the secondary boot process ... Fix up conflict due to typedef removal in sound/arm/aaci.h --- 59b8175c771040afcd4ad67022b0cc80c216b866 diff --cc include/asm-arm/arch-at91/gpio.h index e09d6528fad,256f9b200ab..98ad2114f43 --- a/include/asm-arm/arch-at91/gpio.h +++ b/include/asm-arm/arch-at91/gpio.h @@@ -176,10 -153,41 +153,42 @@@ #define AT91_PIN_PD30 (PIN_BASE + 0x60 + 30) #define AT91_PIN_PD31 (PIN_BASE + 0x60 + 31) + #define AT91_PIN_PE0 (PIN_BASE + 0x80 + 0) + #define AT91_PIN_PE1 (PIN_BASE + 0x80 + 1) + #define AT91_PIN_PE2 (PIN_BASE + 0x80 + 2) + #define AT91_PIN_PE3 (PIN_BASE + 0x80 + 3) + #define AT91_PIN_PE4 (PIN_BASE + 0x80 + 4) + #define AT91_PIN_PE5 (PIN_BASE + 0x80 + 5) + #define AT91_PIN_PE6 (PIN_BASE + 0x80 + 6) + #define AT91_PIN_PE7 (PIN_BASE + 0x80 + 7) + #define AT91_PIN_PE8 (PIN_BASE + 0x80 + 8) + #define AT91_PIN_PE9 (PIN_BASE + 0x80 + 9) + #define AT91_PIN_PE10 (PIN_BASE + 0x80 + 10) + #define AT91_PIN_PE11 (PIN_BASE + 0x80 + 11) + #define AT91_PIN_PE12 (PIN_BASE + 0x80 + 12) + #define AT91_PIN_PE13 (PIN_BASE + 0x80 + 13) + #define AT91_PIN_PE14 (PIN_BASE + 0x80 + 14) + #define AT91_PIN_PE15 (PIN_BASE + 0x80 + 15) + #define AT91_PIN_PE16 (PIN_BASE + 0x80 + 16) + #define AT91_PIN_PE17 (PIN_BASE + 0x80 + 17) + #define AT91_PIN_PE18 (PIN_BASE + 0x80 + 18) + #define AT91_PIN_PE19 (PIN_BASE + 0x80 + 19) + #define AT91_PIN_PE20 (PIN_BASE + 0x80 + 20) + #define AT91_PIN_PE21 (PIN_BASE + 0x80 + 21) + #define AT91_PIN_PE22 (PIN_BASE + 0x80 + 22) + #define AT91_PIN_PE23 (PIN_BASE + 0x80 + 23) + #define AT91_PIN_PE24 (PIN_BASE + 0x80 + 24) + #define AT91_PIN_PE25 (PIN_BASE + 0x80 + 25) + #define AT91_PIN_PE26 (PIN_BASE + 0x80 + 26) + #define AT91_PIN_PE27 (PIN_BASE + 0x80 + 27) + #define AT91_PIN_PE28 (PIN_BASE + 0x80 + 28) + #define AT91_PIN_PE29 (PIN_BASE + 0x80 + 29) + #define AT91_PIN_PE30 (PIN_BASE + 0x80 + 30) + #define AT91_PIN_PE31 (PIN_BASE + 0x80 + 31) + #ifndef __ASSEMBLY__ /* setup setup routines, called from board init or driver probe() */ +extern int __init_or_module at91_set_GPIO_periph(unsigned pin, int use_pullup); extern int __init_or_module at91_set_A_periph(unsigned pin, int use_pullup); extern int __init_or_module at91_set_B_periph(unsigned pin, int use_pullup); extern int __init_or_module at91_set_gpio_input(unsigned pin, int use_pullup); diff --cc sound/arm/aaci.h index 9175ff9ded0,788c24afaf9..924f69c1c44 --- a/sound/arm/aaci.h +++ b/sound/arm/aaci.h @@@ -228,7 -228,8 +228,8 @@@ struct aaci /* AC'97 */ struct mutex ac97_sem; - ac97_bus_t *ac97_bus; - ac97_t *ac97; + struct snd_ac97_bus *ac97_bus; ++ struct snd_ac97 *ac97; u32 maincr; spinlock_t lock;