diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
commit | f85a6597a6ce33fe4f390744b2764b30aa7bfda8 (patch) | |
tree | 9b923afc20e7d3a7e78f98d600fd7e6633b4265b /drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | |
parent | ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525 (diff) | |
parent | Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus (diff) | |
download | linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.tar.xz linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.zip |
Merge tag 'asoc-v3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A few driver specific fixes here plus one core fix for a memory
corruption issue in DAPM initialisation which could lead to crashes.
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/fb/priv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/core/subdev/fb/priv.h index 6c974dd83e8b..db9d6ddde52c 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/priv.h +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/priv.h @@ -81,7 +81,7 @@ void nv44_fb_tile_prog(struct nouveau_fb *, int, struct nouveau_fb_tile *); void nv46_fb_tile_init(struct nouveau_fb *, int i, u32 addr, u32 size, u32 pitch, u32 flags, struct nouveau_fb_tile *); -void nv50_ram_put(struct nouveau_fb *, struct nouveau_mem **); +void __nv50_ram_put(struct nouveau_fb *, struct nouveau_mem *); extern int nv50_fb_memtype[0x80]; #endif |