diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
| commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
| tree | 57049641755e7e01d6da9a902ac662a28b688b0b /drivers/bus/omap_l3_noc.c | |
| parent | 065380f0880dd651eb405430745926dc4747b759 (diff) | |
| parent | 49a170bcf28af5ef372cdbed7750ba8d4162bb0e (diff) | |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
just hadn't worked before, nobody noticed due to lack of use.
Diffstat (limited to 'drivers/bus/omap_l3_noc.c')
| -rw-r--r-- | drivers/bus/omap_l3_noc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c index ab911a33f8a8..feeecae623f6 100644 --- a/drivers/bus/omap_l3_noc.c +++ b/drivers/bus/omap_l3_noc.c @@ -128,7 +128,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) return IRQ_HANDLED; } -static int __devinit omap4_l3_probe(struct platform_device *pdev) +static int omap4_l3_probe(struct platform_device *pdev) { static struct omap4_l3 *l3; struct resource *res; @@ -219,7 +219,7 @@ err0: return ret; } -static int __devexit omap4_l3_remove(struct platform_device *pdev) +static int omap4_l3_remove(struct platform_device *pdev) { struct omap4_l3 *l3 = platform_get_drvdata(pdev); @@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, l3_noc_match); static struct platform_driver omap4_l3_driver = { .probe = omap4_l3_probe, - .remove = __devexit_p(omap4_l3_remove), + .remove = omap4_l3_remove, .driver = { .name = "omap_l3_noc", .owner = THIS_MODULE, |