tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

* '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

Linus Torvalds 427e3df6 ca56a95e

+4 -4
+2 -2
arch/arm/mach-shmobile/board-ag5evm.c
··· 381 381 gpio_set_value(GPIO_PORT114, state); 382 382 } 383 383 384 - static struct sh_mobile_sdhi_info sh_sdhi1_platdata = { 384 + static struct sh_mobile_sdhi_info sh_sdhi1_info = { 385 385 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, 386 386 .tmio_caps = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ, 387 387 .tmio_ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, ··· 413 413 .name = "sh_mobile_sdhi", 414 414 .id = 1, 415 415 .dev = { 416 - .platform_data = &sh_sdhi1_platdata, 416 + .platform_data = &sh_sdhi1_info, 417 417 }, 418 418 .num_resources = ARRAY_SIZE(sdhi1_resources), 419 419 .resource = sdhi1_resources,
+1 -1
arch/arm/mach-shmobile/board-ap4evb.c
··· 913 913 I2C_BOARD_INFO("imx074", 0x1a), 914 914 }; 915 915 916 - struct soc_camera_link imx074_link = { 916 + static struct soc_camera_link imx074_link = { 917 917 .bus_id = 0, 918 918 .board_info = &imx074_info, 919 919 .i2c_adapter_id = 0,
+1 -1
arch/arm/mach-shmobile/board-mackerel.c
··· 1287 1287 &nor_flash_device, 1288 1288 &smc911x_device, 1289 1289 &lcdc_device, 1290 - &usbhs0_device, 1291 1290 &usb1_host_device, 1292 1291 &usbhs1_device, 1292 + &usbhs0_device, 1293 1293 &leds_device, 1294 1294 &fsi_device, 1295 1295 &fsi_ak4643_device,