Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60ffcbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: drop __initdata tags from static struct platform_device declarations
parents 3546eea8 07ad6ab3

arch/arm/mach-omap1/board-ams-delta.c

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static struct omap_kp_platform_data ams_delta_kp_data __initdata = { 
	.delay		= 9,

};



static struct platform_device ams_delta_kp_device __initdata = {

static struct platform_device ams_delta_kp_device = {

	.name		= "omap-keypad",

	.id		= -1,

	.dev		= {
@@ -225,12 +225,12 @@ static struct platform_device ams_delta_kp_device __initdata = { 
	.resource	= ams_delta_kp_resources,

};



static struct platform_device ams_delta_lcd_device __initdata = {

static struct platform_device ams_delta_lcd_device = {

	.name	= "lcd_ams_delta",

	.id	= -1,

};



static struct platform_device ams_delta_led_device __initdata = {

static struct platform_device ams_delta_led_device = {

	.name	= "ams-delta-led",

	.id	= -1

};
@@ -267,7 +267,7 @@ static struct soc_camera_link ams_delta_iclink = { 
	.power		= ams_delta_camera_power,

};



static struct platform_device ams_delta_camera_device __initdata = {

static struct platform_device ams_delta_camera_device = {

	.name   = "soc-camera-pdrv",

	.id     = 0,

	.dev    = {

arch/arm/mach-omap1/gpio15xx.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = { 
	.bank_stride		= 1,

};



static struct __initdata platform_device omap15xx_mpu_gpio = {

static struct platform_device omap15xx_mpu_gpio = {

	.name           = "omap_gpio",

	.id             = 0,

	.dev            = {
@@ -70,7 +70,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { 
	.bank_width		= 16,

};



static struct __initdata platform_device omap15xx_gpio = {

static struct platform_device omap15xx_gpio = {

	.name           = "omap_gpio",

	.id             = 1,

	.dev            = {

arch/arm/mach-omap1/gpio16xx.c

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = { 
	.bank_stride		= 1,

};



static struct __initdata platform_device omap16xx_mpu_gpio = {

static struct platform_device omap16xx_mpu_gpio = {

	.name           = "omap_gpio",

	.id             = 0,

	.dev            = {
@@ -73,7 +73,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = { 
	.bank_width		= 16,

};



static struct __initdata platform_device omap16xx_gpio1 = {

static struct platform_device omap16xx_gpio1 = {

	.name           = "omap_gpio",

	.id             = 1,

	.dev            = {
@@ -102,7 +102,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { 
	.bank_width		= 16,

};



static struct __initdata platform_device omap16xx_gpio2 = {

static struct platform_device omap16xx_gpio2 = {

	.name           = "omap_gpio",

	.id             = 2,

	.dev            = {
@@ -131,7 +131,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { 
	.bank_width		= 16,

};



static struct __initdata platform_device omap16xx_gpio3 = {

static struct platform_device omap16xx_gpio3 = {

	.name           = "omap_gpio",

	.id             = 3,

	.dev            = {
@@ -160,7 +160,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { 
	.bank_width		= 16,

};



static struct __initdata platform_device omap16xx_gpio4 = {

static struct platform_device omap16xx_gpio4 = {

	.name           = "omap_gpio",

	.id             = 4,

	.dev            = {

arch/arm/mach-omap1/gpio7xx.c

+7 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = { 
	.bank_stride		= 2,

};



static struct __initdata platform_device omap7xx_mpu_gpio = {

static struct platform_device omap7xx_mpu_gpio = {

	.name           = "omap_gpio",

	.id             = 0,

	.dev            = {
@@ -75,7 +75,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio1 = {

static struct platform_device omap7xx_gpio1 = {

	.name           = "omap_gpio",

	.id             = 1,

	.dev            = {
@@ -104,7 +104,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio2 = {

static struct platform_device omap7xx_gpio2 = {

	.name           = "omap_gpio",

	.id             = 2,

	.dev            = {
@@ -133,7 +133,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio3 = {

static struct platform_device omap7xx_gpio3 = {

	.name           = "omap_gpio",

	.id             = 3,

	.dev            = {
@@ -162,7 +162,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio4 = {

static struct platform_device omap7xx_gpio4 = {

	.name           = "omap_gpio",

	.id             = 4,

	.dev            = {
@@ -191,7 +191,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio5 = {

static struct platform_device omap7xx_gpio5 = {

	.name           = "omap_gpio",

	.id             = 5,

	.dev            = {
@@ -220,7 +220,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { 
	.bank_width		= 32,

};



static struct __initdata platform_device omap7xx_gpio6 = {

static struct platform_device omap7xx_gpio6 = {

	.name           = "omap_gpio",

	.id             = 6,

	.dev            = {

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,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	= {