diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/media/radio/radio-timb.c | |
| parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff) | |
| parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff) | |
| download | linux-4b87f922598acf91eee18f71688a33f54f57bcde.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/radio/radio-timb.c')
| -rw-r--r-- | drivers/media/radio/radio-timb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c index 5cf07779f4bb..b87effeb5dc6 100644 --- a/drivers/media/radio/radio-timb.c +++ b/drivers/media/radio/radio-timb.c @@ -145,7 +145,7 @@ static const struct v4l2_file_operations timbradio_fops = { .unlocked_ioctl = video_ioctl2, }; -static int __devinit timbradio_probe(struct platform_device *pdev) +static int timbradio_probe(struct platform_device *pdev) { struct timb_radio_platform_data *pdata = pdev->dev.platform_data; struct timbradio *tr; @@ -201,7 +201,7 @@ err: return err; } -static int __devexit timbradio_remove(struct platform_device *pdev) +static int timbradio_remove(struct platform_device *pdev) { struct timbradio *tr = platform_get_drvdata(pdev); @@ -219,7 +219,7 @@ static struct platform_driver timbradio_platform_driver = { .owner = THIS_MODULE, }, .probe = timbradio_probe, - .remove = __devexit_p(timbradio_remove), + .remove = timbradio_remove, }; module_platform_driver(timbradio_platform_driver); |