From 1e9a33729db3598dd394e66492e1a43b9092e774 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Mon, 18 Oct 2004 18:07:05 -0700 Subject: [PATCH] [PATCH] fbdev: Remove i810fb explicit agp initialization hack. When Antonino A. Daplas posted his "fbdev: Initialize i810fb after agpgart" patch he said that the ugly agp initialization hack for intel agp shouldn't be needed but that he couldn't test it. I have tested the framebuffer updates and additionally removed the initialization hack and it does indeed work. Signed-off-by: Andreas Henriksson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/agp/intel-agp.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 7bec505ad95ee..b7b3c56177564 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -1782,16 +1782,8 @@ static struct pci_driver agp_intel_pci_driver = { .resume = agp_intel_resume, }; -/* intel_agp_init() must not be declared static for explicit - early initialization to work (ie i810fb) */ -int __init agp_intel_init(void) +static int __init agp_intel_init(void) { - static int agp_initialised=0; - - if (agp_initialised == 1) - return 0; - agp_initialised=1; - return pci_module_init(&agp_intel_pci_driver); } -- 2.53.0