From cbaa0ab8961ff0fadbfa58c3c986cf336502ab34 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 26 Apr 2007 00:04:39 -0700
Subject: [PATCH] --- yaml --- r: 53985 b: refs/heads/master c:
 3e18c8dd0d3456f96e13bc2e72197bfae11d8501 h: refs/heads/master i:   53983:
 e764f208b59331927c55d1c43c352421c6360f6d v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-at91/board-sam9260ek.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f7f9e867c6a5..2137612dee1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d01f133412b0e27b340ab1bbb2cf0017329ae61
+refs/heads/master: 3e18c8dd0d3456f96e13bc2e72197bfae11d8501
diff --git a/trunk/arch/arm/mach-at91/board-sam9260ek.c b/trunk/arch/arm/mach-at91/board-sam9260ek.c
index 57fb4499d969..7a31db01b6fe 100644
--- a/trunk/arch/arm/mach-at91/board-sam9260ek.c
+++ b/trunk/arch/arm/mach-at91/board-sam9260ek.c
@@ -118,7 +118,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct __initdata at91_eth_data ek_macb_data = {
+static struct at91_eth_data __initdata ek_macb_data = {
 	.phy_irq_pin	= AT91_PIN_PA7,
 	.is_rmii	= 1,
 };
@@ -140,7 +140,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 	},
 };
 
-static struct mtd_partition *nand_partitions(int size, int *num_partitions)
+static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
 {
 	*num_partitions = ARRAY_SIZE(ek_nand_partition);
 	return ek_nand_partition;