Commit:     3e18c8dd0d3456f96e13bc2e72197bfae11d8501
Parent:     5d01f133412b0e27b340ab1bbb2cf0017329ae61
Author:     Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 26 00:04:39 2007 -0700
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 10:26:47 2007 +0100

    [ARM] fix section mismatch warning in board-sam9260
    Andrew Morton found a section mismatch warning in x86_64 triggered by a
    wrongly placed __initdata marker.
    git grep "struct __initdata" revealed that board-sam9260.c had the same
    This patch fixes this by placing the __initdata marker correct.  It was
    checked with objdump that the variable was moved to by this
    Fixed an unrelated section mismatch warning while touching the file.
    Both changes are only compile tested but obvious correct.
    [Used at91sam9260ek_defconfig to get compile coverage]
    Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 arch/arm/mach-at91/board-sam9260ek.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/board-sam9260ek.c 
index 57fb449..7a31db0 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/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 = ARRAY_SIZE(ek_nand_partition);
        return ek_nand_partition;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to