Commit 8cd8647b authored by Dave Jones's avatar Dave Jones

Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart
parents 6e9445e6 ce8e7fee
......@@ -203,8 +203,8 @@
#define LOCKUP 8
struct gtt_data {
agp_memory *i810_fb_memory;
agp_memory *i810_cursor_memory;
struct agp_memory *i810_fb_memory;
struct agp_memory *i810_cursor_memory;
};
struct mode_registers {
......
......@@ -1926,11 +1926,6 @@ static void __exit i810fb_remove_pci(struct pci_dev *dev)
#ifndef MODULE
int __init i810fb_init(void)
{
if (agp_init()) {
printk("i810fb_init: cannot initialize agpgart\n");
return -ENODEV;
}
if (agp_intel_init()) {
printk("i810fb_init: cannot initialize intel agpgart\n");
return -ENODEV;
......
......@@ -111,7 +111,6 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
/* Initialization */
static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
extern int __init agp_intel_init(void);
extern int __init agp_init(void);
/* Video Timings */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment