Skip to content

Commit cc3eb21

Browse files
foxdroddUlrich Hecht
authored andcommitted
fbdev: pvr2fb: Fix leftover reference to ONCHIP_NR_DMA_CHANNELS
commit 5f566c0ac51cd2474e47da68dbe719d3acf7d999 upstream. Commit e24cca1 ("sh: Kill off MAX_DMA_ADDRESS leftovers.") removed the define ONCHIP_NR_DMA_CHANNELS. So that the leftover reference needs to be replaced by CONFIG_NR_ONCHIP_DMA_CHANNELS to compile successfully with CONFIG_PVR2_DMA enabled. Signed-off-by: Florian Fuchs <fuchsfl@gmail.com> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Helge Deller <deller@gmx.de> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent d06834e commit cc3eb21

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/video/fbdev/pvr2fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static unsigned long pvr2fb_map;
190190

191191
#ifdef CONFIG_PVR2_DMA
192192
static unsigned int shdma = PVR2_CASCADE_CHAN;
193-
static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
193+
static unsigned int pvr2dma = CONFIG_NR_ONCHIP_DMA_CHANNELS;
194194
#endif
195195

196196
static int pvr2fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue,

0 commit comments

Comments
 (0)