Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

Browse source 
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  ARM: mach-shmobile: make a struct in board-ap4evb.c static
  ARM: mach-shmobile: ag5evm: consistently name sdhi info structures
  ARM: mach-shmobile: mackerel: change usbhs devices order
This commit is contained in:
Linus Torvalds 2011-06-30 10:43:04 -07:00
commit 427e3df6f2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-shmobile/board-ag5evm.c
View file

@ -381,7 +381,7 @@ void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)
gpio_set_value(GPIO_PORT114, state); gpio_set_value(GPIO_PORT114, state);
} }
static struct sh_mobile_sdhi_info sh_sdhi1_platdata = { static struct sh_mobile_sdhi_info sh_sdhi1_info = {
.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE,
.tmio_caps = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ, .tmio_caps = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
.tmio_ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, .tmio_ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
@ -413,7 +413,7 @@ static struct platform_device sdhi1_device = {
.name = "sh_mobile_sdhi", .name = "sh_mobile_sdhi",
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &sh_sdhi1_platdata, .platform_data = &sh_sdhi1_info,
}, },
.num_resources = ARRAY_SIZE(sdhi1_resources), .num_resources = ARRAY_SIZE(sdhi1_resources),
.resource = sdhi1_resources, .resource = sdhi1_resources,

2
arch/arm/mach-shmobile/board-ap4evb.c
View file

@ -913,7 +913,7 @@ static struct i2c_board_info imx074_info = {
I2C_BOARD_INFO("imx074", 0x1a), I2C_BOARD_INFO("imx074", 0x1a),
}; };
struct soc_camera_link imx074_link = { static struct soc_camera_link imx074_link = {
.bus_id = 0, .bus_id = 0,
.board_info = &imx074_info, .board_info = &imx074_info,
.i2c_adapter_id = 0, .i2c_adapter_id = 0,

2
arch/arm/mach-shmobile/board-mackerel.c
View file

@ -1287,9 +1287,9 @@ static struct platform_device *mackerel_devices[] __initdata = {
&nor_flash_device, &nor_flash_device,
&smc911x_device, &smc911x_device,
&lcdc_device, &lcdc_device,
&usbhs0_device,
&usb1_host_device, &usb1_host_device,
&usbhs1_device, &usbhs1_device,
&usbhs0_device,
&leds_device, &leds_device,
&fsi_device, &fsi_device,
&fsi_ak4643_device, &fsi_ak4643_device,