diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 20:41:54 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 20:41:54 +0400 |
commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
tree | 57049641755e7e01d6da9a902ac662a28b688b0b /drivers/gpu/drm/mgag200/mgag200_drv.c | |
parent | 065380f0880dd651eb405430745926dc4747b759 (diff) | |
parent | 49a170bcf28af5ef372cdbed7750ba8d4162bb0e (diff) | |
download | linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.tar.xz |
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/gpu/drm/mgag200/mgag200_drv.c')
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 1e910117b0a2..122b571ccc7c 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -60,8 +60,7 @@ static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) } -static int __devinit -mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { mgag200_kick_out_firmware_fb(pdev); |