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

1 files changed, 21 insertions, 20 deletions

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 9175ff9ded01..924f69c1c44c 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -49,27 +49,27 @@
 #define AACI_DR4        0x0f0   /* data read/written fifo 4 */
 
 /*
- * transmit fifo control register. P48
+ * TX/RX fifo control register (CR). P48
  */
-#define TXCR_FEN        (1 << 16)       /* fifo enable */
-#define TXCR_COMPACT    (1 << 15)       /* compact mode */
-#define TXCR_TSZ16      (0 << 13)       /* 16 bits */
-#define TXCR_TSZ18      (1 << 13)       /* 18 bits */
-#define TXCR_TSZ20      (2 << 13)       /* 20 bits */
-#define TXCR_TSZ12      (3 << 13)       /* 12 bits */
-#define TXCR_TX12       (1 << 12)       /* transmits slot 12 */
-#define TXCR_TX11       (1 << 11)       /* transmits slot 12 */
-#define TXCR_TX10       (1 << 10)       /* transmits slot 12 */
-#define TXCR_TX9        (1 << 9)        /* transmits slot 12 */
-#define TXCR_TX8        (1 << 8)        /* transmits slot 12 */
-#define TXCR_TX7        (1 << 7)        /* transmits slot 12 */
-#define TXCR_TX6        (1 << 6)        /* transmits slot 12 */
-#define TXCR_TX5        (1 << 5)        /* transmits slot 12 */
-#define TXCR_TX4        (1 << 4)        /* transmits slot 12 */
-#define TXCR_TX3        (1 << 3)        /* transmits slot 12 */
-#define TXCR_TX2        (1 << 2)        /* transmits slot 12 */
-#define TXCR_TX1        (1 << 1)        /* transmits slot 12 */
-#define TXCR_TXEN       (1 << 0)        /* transmit enable */
+#define CR_FEN          (1 << 16)       /* fifo enable */
+#define CR_COMPACT      (1 << 15)       /* compact mode */
+#define CR_SZ16         (0 << 13)       /* 16 bits */
+#define CR_SZ18         (1 << 13)       /* 18 bits */
+#define CR_SZ20         (2 << 13)       /* 20 bits */
+#define CR_SZ12         (3 << 13)       /* 12 bits */
+#define CR_SL12         (1 << 12)
+#define CR_SL11         (1 << 11)
+#define CR_SL10         (1 << 10)
+#define CR_SL9          (1 << 9)
+#define CR_SL8          (1 << 8)
+#define CR_SL7          (1 << 7)
+#define CR_SL6          (1 << 6)
+#define CR_SL5          (1 << 5)
+#define CR_SL4          (1 << 4)
+#define CR_SL3          (1 << 3)
+#define CR_SL2          (1 << 2)
+#define CR_SL1          (1 << 1)
+#define CR_EN           (1 << 0)        /* transmit enable */
 
 /*
  * status register bits. P49
@@ -229,6 +229,7 @@ struct aaci {
         /* AC'97 */
         struct mutex            ac97_sem;
         struct snd_ac97_bus     *ac97_bus;
+        struct snd_ac97         *ac97;
 
         u32                     maincr;
         spinlock_t              lock;