Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[karo-tx-linux.git] / arch / arm / mach-at91 / board-sam9263ek.c

diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index e6268b3cbe8ddc21b5c3619a5fb71d26e9c235a4..2d867fb0630f0719723b9aa0fde5ab416725ae5f 100644 (file)
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -57,7 +57,7 @@ static void __init ek_map_io(void)
        /* Initialize processor: 16.367 MHz crystal */
        at91sam9263_initialize(16367660);
 
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
 
        /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
@@ -364,9 +364,9 @@ static void __init ek_add_device_buttons(void) {}
 
 /*
  * AC97
+ * reset_pin is not connected: NRST
  */
-static struct atmel_ac97_data ek_ac97_data = {
-       .reset_pin      = AT91_PIN_PA13,
+static struct ac97c_platform_data ek_ac97_data = {
 };