Patched in Tegra support.

7 files changed, 20 insertions, 12 deletions

diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index afeae8978a8..fafed4c38fd 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -90,6 +90,11 @@ static struct mtd_partition nand_partitions[] = {
         },
 };
 
+static struct mtd_partition *nand_part_info(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(nand_partitions);
+        return nand_partitions;
+}
 
 static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
         .cle            = 21,
@@ -97,9 +102,7 @@ static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
         .rdy_pin        = GPIO_PIN_PB(28),
         .enable_pin     = GPIO_PIN_PE(23),
         .bus_width_16   = true,
-        .ecc_mode       = NAND_ECC_SOFT,
-        .parts          = nand_partitions,
-        .num_parts      = ARRAY_SIZE(nand_partitions),
+        .partition_info = nand_part_info,
 };
 #endif
 
@@ -110,7 +113,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
+static struct eth_platform_data __initdata eth_data[2];
 
 static struct spi_board_info spi0_board_info[] __initdata = {
         {
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 6c80aba7bf9..6ce30fb2ec9 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -90,14 +90,18 @@ static struct mtd_partition nand_partitions[] = {
         },
 };
 
+static struct mtd_partition *nand_part_info(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(nand_partitions);
+        return nand_partitions;
+}
+
 static struct atmel_nand_data atstk1006_nand_data __initdata = {
         .cle            = 21,
         .ale            = 22,
         .rdy_pin        = GPIO_PIN_PB(30),
         .enable_pin     = GPIO_PIN_PB(29),
-        .ecc_mode       = NAND_ECC_SOFT,
-        .parts          = nand_partitions,
-        .num_parts      = ARRAY_SIZE(nand_partitions),
+        .partition_info = nand_part_info,
 };
 #endif
 
@@ -106,7 +110,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2] = {
+static struct eth_platform_data __initdata eth_data[2] = {
         {
                 /*
                  * The MDIO pullups on STK1000 are a bit too weak for
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 27bd6fbe21c..86fab77a5a0 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -50,7 +50,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[1];
-static struct macb_platform_data __initdata eth_data[1] = {
+static struct eth_platform_data __initdata eth_data[1] = {
         {
                 .phy_mask       = ~(1U << 1),
         },
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index 9d1efd1cd42..da14fbdd4e8 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -102,7 +102,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[1];
-static struct macb_platform_data __initdata eth_data[1];
+static struct eth_platform_data __initdata eth_data[1];
 
 /*
  * The next two functions should go away as the boot loader is
diff --git a/arch/avr32/boards/merisc/merisc_sysfs.c b/arch/avr32/boards/merisc/merisc_sysfs.c
index 5a252318f4b..df431fdba9a 100644
--- a/arch/avr32/boards/merisc/merisc_sysfs.c
+++ b/arch/avr32/boards/merisc/merisc_sysfs.c
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/sysdev.h>
 #include <linux/timer.h>
 #include <linux/err.h>
 #include <linux/ctype.h>
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index ed137e33579..e61bc948f95 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -52,7 +52,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
+static struct eth_platform_data __initdata eth_data[2];
 
 static int ads7846_get_pendown_state_PB26(void)
 {
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 05358aa5ef7..c4da5cba2db 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -86,7 +86,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[2];
-static struct macb_platform_data __initdata eth_data[2];
+static struct eth_platform_data __initdata eth_data[2];
 
 static struct spi_eeprom eeprom_25lc010 = {
                 .name = "25lc010",