From 4ce58ee1efc0e48c5df13196c480ce433bc76a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 10 Aug 2010 22:17:19 +0100 Subject: [PATCH] --- yaml --- r: 208583 b: refs/heads/master c: 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc h: refs/heads/master i: 208581: 2f9c2b0c5a058915334fdd833dc46cd112499d35 208579: 7693677bc293b09ead39c4b0dd24cae62ceb2045 208575: c7ae96991683b0786e02bfc32119663338bf3863 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/board-cam60.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8eea519e2270..8b0bdb6f05b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8436b410806d9a9a8ebfa1b924d8a96da893561a +refs/heads/master: 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc diff --git a/trunk/arch/arm/mach-at91/board-cam60.c b/trunk/arch/arm/mach-at91/board-cam60.c index 05c70728f041..44eb9f764938 100644 --- a/trunk/arch/arm/mach-at91/board-cam60.c +++ b/trunk/arch/arm/mach-at91/board-cam60.c @@ -75,7 +75,7 @@ static struct at91_usbh_data __initdata cam60_usbh_data = { * SPI devices. */ #if defined(CONFIG_MTD_DATAFLASH) -static struct mtd_partition __initdata cam60_spi_partitions[] = { +static struct mtd_partition cam60_spi_partitions[] = { { .name = "BOOT1", .offset = 0, @@ -98,7 +98,7 @@ static struct mtd_partition __initdata cam60_spi_partitions[] = { }, }; -static struct flash_platform_data cam60_spi_flash_platform_data __initdata = { +static struct flash_platform_data cam60_spi_flash_platform_data = { .name = "spi_flash", .parts = cam60_spi_partitions, .nr_parts = ARRAY_SIZE(cam60_spi_partitions)