From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 725EF328608; Wed, 3 Dec 2025 16:18:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778718; cv=none; b=fZCe4MjFHvsgrWCfRaInb754HHPv96OPBSHTVzir3I7NtmoEunL54b5cQyM7a9rco/e2rzfRhu7q0wkRqFc5UxJx+b5WdAFbZNAhOmrbhee0wv+4kJQMNsB6LxD+kiia8cnqEK8vp9jm99X1UfHx0xk+PN2NB80BZq11pRISBLU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778718; c=relaxed/simple; bh=AOnldPjLRBobdcGpWvjEjUZLgUlthIoFU+ATEd+1I/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t4KzfG42gFYh6EZ04ZMpDgxGqK1buiiT9bqiLxiZcO/7/QwGR2AHOU8HCEqb8A3Nt8uYyGcsunmOfn8coHgmdk5QPBlINc1EdpVoC6pvBHcMGJE5Q8x3nVS7LgXRki9fy7GVtcLP4c10pI8L1QV3PYtGCxgS+Rgu9w6PL8DYufw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UKxbBZxV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UKxbBZxV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8C57C116B1; Wed, 3 Dec 2025 16:18:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778718; bh=AOnldPjLRBobdcGpWvjEjUZLgUlthIoFU+ATEd+1I/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKxbBZxVuctih0jdCsljv8QnX8r8gY+JujWZK+/J3cGkQ6mMBaCtZG+CycZzuquk7 nO84avYZYFtPlXGY2YaaSAylu0JTM8MjMPO/raUU+Ypxw0eqOs0BtrXQJ8iy9MyRlg M75LOW+ogH6ZmxkCwDPSUF47E4REarkaAKd9yKFQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Fuchs , John Paul Adrian Glaubitz , Helge Deller Subject: [PATCH 6.1 031/568] fbdev: pvr2fb: Fix leftover reference to ONCHIP_NR_DMA_CHANNELS Date: Wed, 3 Dec 2025 16:20:33 +0100 Message-ID: <20251203152441.803489805@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Fuchs commit 5f566c0ac51cd2474e47da68dbe719d3acf7d999 upstream. Commit e24cca19babe ("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 Reviewed-by: John Paul Adrian Glaubitz Signed-off-by: Helge Deller Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/pvr2fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/video/fbdev/pvr2fb.c +++ b/drivers/video/fbdev/pvr2fb.c @@ -192,7 +192,7 @@ static unsigned long pvr2fb_map; #ifdef CONFIG_PVR2_DMA static unsigned int shdma = PVR2_CASCADE_CHAN; -static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS; +static unsigned int pvr2dma = CONFIG_NR_ONCHIP_DMA_CHANNELS; #endif static struct fb_videomode pvr2_modedb[] = {