diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-24 15:49:18 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-24 15:49:18 -0500 |
commit | a32f7d1ad3744914273c6907204c2ab3b5d496a0 (patch) | |
tree | 1c5ae321ee85665707177547c07810ff7e09e1ab /drivers/media/radio/radio-wl1273.c | |
parent | 6b9e50c463efc5c361496ae6a895cc966ff8025b (diff) | |
parent | 68d6f84ba0c47e658beff3a4bf0c43acee4b4690 (diff) |
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
Diffstat (limited to 'drivers/media/radio/radio-wl1273.c')
-rw-r--r-- | drivers/media/radio/radio-wl1273.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 6e55e93c0cf6..681d4aeee530 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c | |||
@@ -1990,7 +1990,7 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev) | |||
1990 | return 0; | 1990 | return 0; |
1991 | } | 1991 | } |
1992 | 1992 | ||
1993 | static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev) | 1993 | static int wl1273_fm_radio_probe(struct platform_device *pdev) |
1994 | { | 1994 | { |
1995 | struct wl1273_core **core = pdev->dev.platform_data; | 1995 | struct wl1273_core **core = pdev->dev.platform_data; |
1996 | struct wl1273_device *radio; | 1996 | struct wl1273_device *radio; |
@@ -2144,7 +2144,7 @@ pdata_err: | |||
2144 | 2144 | ||
2145 | static struct platform_driver wl1273_fm_radio_driver = { | 2145 | static struct platform_driver wl1273_fm_radio_driver = { |
2146 | .probe = wl1273_fm_radio_probe, | 2146 | .probe = wl1273_fm_radio_probe, |
2147 | .remove = __devexit_p(wl1273_fm_radio_remove), | 2147 | .remove = wl1273_fm_radio_remove, |
2148 | .driver = { | 2148 | .driver = { |
2149 | .name = "wl1273_fm_radio", | 2149 | .name = "wl1273_fm_radio", |
2150 | .owner = THIS_MODULE, | 2150 | .owner = THIS_MODULE, |