--- linux-unstable/drivers/video/aty128fb.c Thu Jan 6 14:13:31 2000 +++ linux-stable/drivers/video/aty128fb.c Thu Jan 6 15:45:19 2000 @@ -85,12 +85,14 @@ 0, FB_VMODE_NONINTERLACED }; +#if LINUX_VERSION_CODE >= 0x020300 /* default modedb mode */ static struct fb_videomode defaultmode __initdata = { /* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */ NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED }; +#endif struct aty128_chip_info { const char *name; @@ -1659,8 +1661,10 @@ var = default_var; #endif /* CONFIG_PMAC */ +#if LINUX_VERSION_CODE >=0x020300 if (!fb_find_mode(&var, &info->fb_info, mode_option, NULL, 0, &defaultmode, 8)) +#endif var = default_var; #endif /* MODULE */ @@ -1752,7 +1756,6 @@ return; } - /* register a card ++ajoshi */ static int __init aty128_pci_register(struct pci_dev *pdev, @@ -1760,9 +1763,10 @@ { struct fb_info_aty128 *info = NULL; unsigned long fb_addr, reg_addr; - struct resource *rp; u16 tmp; +#if LINUX_VERSION_CODE >= 0x020300 + struct resource *rp; rp = &pdev->resource[0]; fb_addr = rp->start; @@ -1782,6 +1786,12 @@ } request_mem_region (rp->start, rp->end - rp->start + 1, "aty128fb"); +#else + fb_addr = pdev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK; + reg_addr = pdev->base_address[2] & PCI_BASE_ADDRESS_MEM_MASK; + if (!reg_addr) + return -1; +#endif info = kmalloc(sizeof(struct fb_info_aty128), GFP_ATOMIC); if(!info) { @@ -1830,12 +1840,16 @@ err_out: kfree (info); unmap_out: + +#if LINUX_VERSION_CODE >= 0x020300 release_mem_region (pdev->resource[0].start, pdev->resource[0].end - pdev->resource[0].start + 1); release_mem_region (pdev->resource[2].start, pdev->resource[2].end - pdev->resource[2].start + 1); +#endif + return -1; } #endif /* ! CONFIG_FB_OF */ @@ -2407,12 +2421,16 @@ iounmap (tmp->BIOS_SEG); iounmap (tmp->regbase); iounmap (tmp->frame_buffer); + +#if LINUX_VERSION_CODE >= 0x020300 release_mem_region (tmp->pdev->resource[0].start, tmp->pdev->resource[0].end - tmp->pdev->resource[0].start + 1); release_mem_region (tmp->pdev->resource[2].start, tmp->pdev->resource[2].end - tmp->pdev->resource[2].start + 1); +#endif + kfree (tmp); } }