summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rx51-peripherals.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-21 16:32:06 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-21 16:32:06 +0200
commit5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (patch)
treea8a74ef15a3622ecc3ab94a424321de8b111648b /arch/arm/mach-omap2/board-rx51-peripherals.c
parentc33d4326b60a3aea5cd070a365043f488f81a3b0 (diff)
parent89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 (diff)
Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/board
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 8946d7232f3..0c9e0f28ed0 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -661,7 +661,7 @@ static struct radio_si4713_platform_data rx51_si4713_data __initdata_or_module =
.subdev_board_info = &rx51_si4713_board_info,
};
-static struct platform_device rx51_si4713_dev __initdata_or_module = {
+static struct platform_device rx51_si4713_dev = {
.name = "radio-si4713",
.id = -1,
.dev = {