Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits) [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures [media] uvcvideo: Cleanup leftovers of partial revert [media] uvcvideo: Return -EACCES when trying to set a read-only control Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path ... Conflicts: drivers/media/pci/dm1105/dm1105.c drivers/media/platform/soc_camera/mx2_camera.c
Bu işleme şunda yer alıyor:
@@ -1327,7 +1327,7 @@ static const struct video_device sh_vou_video_template = {
|
||||
.vfl_dir = VFL_DIR_TX,
|
||||
};
|
||||
|
||||
static int __devinit sh_vou_probe(struct platform_device *pdev)
|
||||
static int sh_vou_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct sh_vou_pdata *vou_pdata = pdev->dev.platform_data;
|
||||
struct v4l2_rect *rect;
|
||||
@@ -1462,7 +1462,7 @@ ereqmemreg:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit sh_vou_remove(struct platform_device *pdev)
|
||||
static int sh_vou_remove(struct platform_device *pdev)
|
||||
{
|
||||
int irq = platform_get_irq(pdev, 0);
|
||||
struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
|
||||
@@ -1488,7 +1488,7 @@ static int __devexit sh_vou_remove(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
static struct platform_driver __refdata sh_vou = {
|
||||
.remove = __devexit_p(sh_vou_remove),
|
||||
.remove = sh_vou_remove,
|
||||
.driver = {
|
||||
.name = "sh-vou",
|
||||
.owner = THIS_MODULE,
|
||||
|
Yeni konuda referans
Bir kullanıcı engelle