Francois ROMIEU wrote:
>
> my brand new ac7 bzImage just gave me a nice oops on boot. After all,
> I'm not that sure the following two lines were really needed... Some bag left
> anyone ?
Here's a much better patch...
Jeff
-- Jeff Garzik | Liberty is always dangerous, but Building 1024 | it is the safest thing we have. MandrakeSoft, Inc. | -- Harry Emerson Fosdick
Index: drivers/video/clgenfb.c =================================================================== RCS file: /g/cvslan/linux_2_3/drivers/video/clgenfb.c,v retrieving revision 1.1.1.14 diff -u -r1.1.1.14 clgenfb.c --- drivers/video/clgenfb.c 2000/05/30 23:35:01 1.1.1.14 +++ drivers/video/clgenfb.c 2000/06/01 02:21:01 @@ -31,7 +31,7 @@ * */ -#define CLGEN_VERSION "1.9.6" +#define CLGEN_VERSION "1.9.7" #include <linux/config.h> #include <linux/version.h> @@ -628,12 +628,6 @@ long *nom, long *den, long *div, long maxfreq); -#ifdef CONFIG_PCI -static struct pci_dev *clgen_pci_dev_get (clgen_board_t *btype); -static unsigned int clgen_get_memsize (caddr_t regbase); -static int clgen_pci_setup (struct clgenfb_info *fb_info, clgen_board_t *btype); -#endif /* CONFIG_PCI */ - #ifdef CLGEN_DEBUG static void clgen_dump (void); static void clgen_dbg_reg_dump (caddr_t regbase); @@ -2502,10 +2496,11 @@ pdev = pci_find_device (PCI_VENDOR_ID_CIRRUS, clgen_pci_probe_list[i].device, NULL); - if (pdev) + if (pdev) { *btype = clgen_pci_probe_list[i - 1].btype; - if (pci_enable_device(pdev)) - return NULL; + if (pci_enable_device(pdev)) + return NULL; + } DPRINTK ("EXIT, returning %p\n", pdev); return pdev;
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jun 07 2000 - 21:00:11 EST