Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827Ab0HWJ7r (ORCPT ); Mon, 23 Aug 2010 05:59:47 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:56984 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869Ab0HWJ7o (ORCPT ); Mon, 23 Aug 2010 05:59:44 -0400 Date: Mon, 23 Aug 2010 11:59:41 +0200 From: Christian Dietrich To: Joseph Chan , Florian Tobias Schandinat , Andrew Morton , Jonathan Corbet , Erik-Jan Post , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de Subject: [PATCH 1/2] drivers/video: Removing dead FB_VIA_CAMERA config option Message-ID: <896537c6f9bd2e4babcb9ff4681bb4db72daf544.1282554255.git.qy03fugy@stud.informatik.uni-erlangen.de> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2127 Lines: 60 CONFIG_FB_VIA_CAMERA doesn't exist in Kconfig, therefore removing all references to it from the source. Signed-off-by: Christian Dietrich --- drivers/video/via/accel.c | 16 ---------------- include/linux/via-core.h | 5 +---- 2 files changed, 1 insertions(+), 20 deletions(-) diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c index e44893e..43d4f30 100644 --- a/drivers/video/via/accel.c +++ b/drivers/video/via/accel.c @@ -370,22 +370,6 @@ int viafb_init_engine(struct fb_info *info) viapar->shared->vq_vram_addr = viapar->fbmem_free; viapar->fbmem_used += VQ_SIZE; -#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE) - /* - * Set aside a chunk of framebuffer memory for the camera - * driver. Someday this driver probably needs a proper allocator - * for fbmem; for now, we just have to do this before the - * framebuffer initializes itself. - * - * As for the size: the engine can handle three frames, - * 16 bits deep, up to VGA resolution. - */ - viapar->shared->vdev->camera_fbmem_size = 3*VGA_HEIGHT*VGA_WIDTH*2; - viapar->fbmem_free -= viapar->shared->vdev->camera_fbmem_size; - viapar->fbmem_used += viapar->shared->vdev->camera_fbmem_size; - viapar->shared->vdev->camera_fbmem_offset = viapar->fbmem_free; -#endif - /* Init AGP and VQ regs */ switch (chip_name) { case UNICHROME_K8M890: diff --git a/include/linux/via-core.h b/include/linux/via-core.h index 7ffb521..7fc611e 100644 --- a/include/linux/via-core.h +++ b/include/linux/via-core.h @@ -81,10 +81,7 @@ struct viafb_dev { unsigned long fbmem_start; long fbmem_len; void __iomem *fbmem; -#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE) - long camera_fbmem_offset; - long camera_fbmem_size; -#endif + /* * The MMIO region for device registers. */ -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/