git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
agp
/
ali-agp.c
diff --git
a/drivers/char/agp/ali-agp.c
b/drivers/char/agp/ali-agp.c
index
005b820
..
d5bce32
100644
(file)
--- a/
drivers/char/agp/ali-agp.c
+++ b/
drivers/char/agp/ali-agp.c
@@
-277,6
+277,15
@@
static struct agp_device_ids ali_agp_device_ids[] __devinitdata =
.device_id = PCI_DEVICE_ID_AL_M1671,
.chipset_name = "M1671",
},
.device_id = PCI_DEVICE_ID_AL_M1671,
.chipset_name = "M1671",
},
+ {
+ .device_id = PCI_DEVICE_ID_AL_M1681,
+ .chipset_name = "M1681",
+ },
+ {
+ .device_id = PCI_DEVICE_ID_AL_M1683,
+ .chipset_name = "M1683",
+ },
+
{ }, /* dummy final entry, always present */
};
{ }, /* dummy final entry, always present */
};
@@
-387,6
+396,8
@@
static struct pci_driver agp_ali_pci_driver = {
static int __init agp_ali_init(void)
{
static int __init agp_ali_init(void)
{
+ if (agp_off)
+ return -EINVAL;
return pci_module_init(&agp_ali_pci_driver);
}
return pci_module_init(&agp_ali_pci_driver);
}