summaryrefslogtreecommitdiff
path: root/drivers/video/i810/i810_main.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-10 20:41:54 +0400
committerTakashi Iwai <tiwai@suse.de>2013-01-10 20:41:54 +0400
commitc18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch)
tree57049641755e7e01d6da9a902ac662a28b688b0b /drivers/video/i810/i810_main.h
parent065380f0880dd651eb405430745926dc4747b759 (diff)
parent49a170bcf28af5ef372cdbed7750ba8d4162bb0e (diff)
downloadlinux-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/video/i810/i810_main.h')
-rw-r--r--drivers/video/i810/i810_main.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/i810/i810_main.h b/drivers/video/i810/i810_main.h
index 51d4f3d4116d..a25afaa534ba 100644
--- a/drivers/video/i810/i810_main.h
+++ b/drivers/video/i810/i810_main.h
@@ -64,7 +64,7 @@ static inline void flush_cache(void)
#include <asm/mtrr.h>
-static inline void __devinit set_mtrr(struct i810fb_par *par)
+static inline void set_mtrr(struct i810fb_par *par)
{
par->mtrr_reg = mtrr_add((u32) par->aperture.physical,
par->aperture.size, MTRR_TYPE_WRCOMB, 1);