diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:32:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:32:06 -0400 |
| commit | 5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (patch) | |
| tree | a8a74ef15a3622ecc3ab94a424321de8b111648b /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | c33d4326b60a3aea5cd070a365043f488f81a3b0 (diff) | |
| parent | 89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 (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.c | 2 |
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 8946d7232f3c..0c9e0f28ed07 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 = | |||
| 661 | .subdev_board_info = &rx51_si4713_board_info, | 661 | .subdev_board_info = &rx51_si4713_board_info, |
| 662 | }; | 662 | }; |
| 663 | 663 | ||
| 664 | static struct platform_device rx51_si4713_dev __initdata_or_module = { | 664 | static struct platform_device rx51_si4713_dev = { |
| 665 | .name = "radio-si4713", | 665 | .name = "radio-si4713", |
| 666 | .id = -1, | 666 | .id = -1, |
| 667 | .dev = { | 667 | .dev = { |