bk://linux-dj.bkbits.net/agpgart
davej@redhat.com|ChangeSet|20040810005722|35640 davej
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/08/10 01:57:22+01:00 davej@redhat.com
# [AGPGART] Fix MVP3 typo.
#
# Spotted by Lars Gregori
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/Kconfig
# 2004/08/10 01:57:15+01:00 davej@redhat.com +1 -1
# [AGPGART] Fix MVP3 typo.
#
# Spotted by Lars Gregori
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/09 15:19:48+01:00 davej@redhat.com
# [AGPGART] SiS 635 support.
#
# From: Pavel Kysilka
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/sis-agp.c
# 2004/08/09 15:19:39+01:00 davej@redhat.com +4 -0
# [AGPGART] SiS 635 support.
#
# From: Pavel Kysilka
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/05 12:39:41-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-agp.c
# 2004/08/05 12:39:37-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/05 13:51:57+01:00 davej@redhat.com
# [AGPGART] Sparse trivial warning fixes.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-agp.c
# 2004/08/05 13:51:46+01:00 davej@redhat.com +3 -3
# [AGPGART] Sparse trivial warning fixes.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/04 02:37:29-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# drivers/char/agp/intel-mch-agp.c
# 2004/08/04 02:37:25-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/08/04 02:37:25-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/03 23:07:39+01:00 davej@redhat.com
# [AGPGART] Trailing whitespace cleanup
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-agp.c
# 2004/08/03 23:07:31+01:00 davej@redhat.com +33 -33
# [AGPGART] Trailing whitespace cleanup
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/03 23:02:40+01:00 davej@redhat.com
# [AGPGART] Delete confusing message when not using onboard i815 gfx.
#
# If you use an external graphic card, the secondary device disappears,
# which makes agpgart spew a message like
#
# Detected an Intel i815 Chipset, but could not find the secondary device.
#
# Which is ok, as we don't want to use it anyway.
# This is confusing to users, as I've even had some people saying they
# thought it was a hardware fault.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-agp.c
# 2004/08/03 23:02:31+01:00 davej@redhat.com +13 -15
# [AGPGART] Delete confusing message when not using onboard i815 gfx.
#
# If you use an external graphic card, the secondary device disappears,
# which makes agpgart spew a message like
#
# Detected an Intel i815 Chipset, but could not find the secondary device.
#
# Which is ok, as we don't want to use it anyway.
# This is confusing to users, as I've even had some people saying they
# thought it was a hardware fault.
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/08/02 22:45:31+01:00 davej@redhat.com
# [AGPGART] License updates.
# These drivers 'inherited' the license of the old agpgart code, which was
# licensed as 'and additional rights' even though those rights were never
# publically documented anywhere to my knowledge.
# This was a hangover from the days when agpgart maintainence was done primarily
# in the X tree, where GPL code cannot live without 'additional rights'.
#
# These days, agpgart maintainence happens in the kernel tree, so these
# 'additional rights' mean nothing. Remove them from some drivers.
# (More to follow).
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/via-agp.c
# 2004/08/02 22:45:24+01:00 davej@redhat.com +1 -1
# [AGPGART] License updates.
# These drivers 'inherited' the license of the old agpgart code, which was
# licensed as 'and additional rights' even though those rights were never
# publically documented anywhere to my knowledge.
# This was a hangover from the days when agpgart maintainence was done primarily
# in the X tree, where GPL code cannot live without 'additional rights'.
#
# These days, agpgart maintainence happens in the kernel tree, so these
# 'additional rights' mean nothing. Remove them from some drivers.
# (More to follow).
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/intel-mch-agp.c
# 2004/08/02 22:45:24+01:00 davej@redhat.com +1 -1
# [AGPGART] License updates.
# These drivers 'inherited' the license of the old agpgart code, which was
# licensed as 'and additional rights' even though those rights were never
# publically documented anywhere to my knowledge.
# This was a hangover from the days when agpgart maintainence was done primarily
# in the X tree, where GPL code cannot live without 'additional rights'.
#
# These days, agpgart maintainence happens in the kernel tree, so these
# 'additional rights' mean nothing. Remove them from some drivers.
# (More to follow).
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# drivers/char/agp/amd64-agp.c
# 2004/08/02 22:45:24+01:00 davej@redhat.com +1 -1
# [AGPGART] License updates.
# These drivers 'inherited' the license of the old agpgart code, which was
# licensed as 'and additional rights' even though those rights were never
# publically documented anywhere to my knowledge.
# This was a hangover from the days when agpgart maintainence was done primarily
# in the X tree, where GPL code cannot live without 'additional rights'.
#
# These days, agpgart maintainence happens in the kernel tree, so these
# 'additional rights' mean nothing. Remove them from some drivers.
# (More to follow).
#
# Signed-off-by: Dave Jones <davej@redhat.com>
#
# ChangeSet
# 2004/07/31 23:52:37-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/31 23:52:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/30 22:16:17-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/30 22:16:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/07/30 22:16:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/27 13:18:37-07:00 akpm@bix.(none)
# Merge bk://linux-dj.bkbits.net/agpgart
# into bix.(none):/usr/src/bk-agpgart
#
# include/linux/pci_ids.h
# 2004/07/27 13:18:32-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/agp/intel-agp.c
# 2004/07/27 13:18:32-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
diff -Nru a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
--- a/drivers/char/agp/Kconfig 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/Kconfig 2004-08-18 23:09:59 -07:00
@@ -130,7 +130,7 @@
depends on AGP && X86 && !X86_64
help
This option gives you AGP support for the GLX component of
- XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
+ XFree86 4.x on VIA MVP3/Apollo Pro chipsets.
You should say Y here if you use XFree86 3.3.6 or 4.x and want to
use GLX or DRI. If unsure, say N.
diff -Nru a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/amd64-agp.c 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/amd64-agp.c 2004-08-18 23:09:59 -07:00
@@ -675,4 +675,4 @@
MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>, Andi Kleen");
MODULE_PARM(agp_try_unsupported, "1i");
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/intel-agp.c 2004-08-18 23:09:59 -07:00
@@ -162,11 +162,11 @@
page = alloc_pages(GFP_KERNEL, 2);
if (page == NULL) {
- return 0;
+ return NULL;
}
if (change_page_attr(page, 4, PAGE_KERNEL_NOCACHE) < 0) {
- __free_page(page);
- return 0;
+ __free_page(page);
+ return NULL;
}
get_page(page);
SetPageLocked(page);
@@ -180,7 +180,7 @@
if (addr == NULL)
return;
-
+
page = virt_to_page(addr);
change_page_attr(page, 4, PAGE_KERNEL);
put_page(page);
@@ -330,7 +330,7 @@
if (curr->page_count == 4)
i8xx_destroy_pages(phys_to_virt(curr->memory[0]));
else
- agp_bridge->driver->agp_destroy_page(
+ agp_bridge->driver->agp_destroy_page(
phys_to_virt(curr->memory[0]));
vfree(curr->memory);
}
@@ -371,7 +371,7 @@
/* We obtain the size of the GTT, which is also stored (for some
* reason) at the top of stolen memory. Then we add 4KB to that
- * for the video BIOS popup, which is also stored in there. */
+ * for the video BIOS popup, which is also stored in there. */
size = agp_bridge->driver->fetch_size() + 4;
if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82830_HB ||
@@ -746,13 +746,13 @@
size = agp_bridge->current_size;
page_order = size->page_order;
num_entries = size->num_entries;
- agp_bridge->gatt_table_real = 0;
+ agp_bridge->gatt_table_real = NULL;
pci_read_config_dword(intel_i830_private.i830_dev, I915_MMADDR, &temp);
pci_read_config_dword(intel_i830_private.i830_dev, I915_PTEADDR,&temp2);
intel_i830_private.gtt = (volatile u32 *) ioremap(temp2, 256 * 1024);
- if (!intel_i830_private.gtt)
+ if (!intel_i830_private.gtt)
return (-ENOMEM);
temp &= 0xfff80000;
@@ -921,7 +921,7 @@
/* aperture size */
pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE,
- current_size->size_value);
+ current_size->size_value);
/* address to map to */
pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
@@ -933,7 +933,7 @@
pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, addr);
/* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
/* apcont */
pci_read_config_byte(agp_bridge->dev, INTEL_815_APCONT, &temp2);
@@ -956,7 +956,7 @@
previous_size = A_SIZE_8(agp_bridge->previous_size);
pci_read_config_byte(agp_bridge->dev, INTEL_I820_RDCR, &temp);
- pci_write_config_byte(agp_bridge->dev, INTEL_I820_RDCR,
+ pci_write_config_byte(agp_bridge->dev, INTEL_I820_RDCR,
temp & ~(1 << 1));
pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE,
previous_size->size_value);
@@ -966,23 +966,23 @@
static int intel_820_configure(void)
{
u32 temp;
- u8 temp2;
+ u8 temp2;
struct aper_size_info_8 *current_size;
current_size = A_SIZE_8(agp_bridge->current_size);
/* aperture size */
- pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
+ pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
/* address to map to */
pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
/* attbase - aperture base */
- pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
+ pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
/* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
/* global enable aperture access */
/* This flag is not accessed through MCHCFG register as in */
@@ -990,7 +990,7 @@
pci_read_config_byte(agp_bridge->dev, INTEL_I820_RDCR, &temp2);
pci_write_config_byte(agp_bridge->dev, INTEL_I820_RDCR, temp2 | (1 << 1));
/* clear any possible AGP-related error conditions */
- pci_write_config_word(agp_bridge->dev, INTEL_I820_ERRSTS, 0x001c);
+ pci_write_config_word(agp_bridge->dev, INTEL_I820_ERRSTS, 0x001c);
return 0;
}
@@ -1003,23 +1003,23 @@
current_size = A_SIZE_8(agp_bridge->current_size);
/* aperture size */
- pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
+ pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
/* address to map to */
pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
/* attbase - aperture base */
- pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
+ pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
/* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
/* mcgcfg */
pci_read_config_word(agp_bridge->dev, INTEL_I840_MCHCFG, &temp2);
pci_write_config_word(agp_bridge->dev, INTEL_I840_MCHCFG, temp2 | (1 << 9));
/* clear any possible error conditions */
- pci_write_config_word(agp_bridge->dev, INTEL_I840_ERRSTS, 0xc000);
+ pci_write_config_word(agp_bridge->dev, INTEL_I840_ERRSTS, 0xc000);
return 0;
}
@@ -1032,23 +1032,23 @@
current_size = A_SIZE_8(agp_bridge->current_size);
/* aperture size */
- pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
+ pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
/* address to map to */
pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
/* attbase - aperture base */
- pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
+ pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
/* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
/* agpm */
pci_read_config_byte(agp_bridge->dev, INTEL_I845_AGPM, &temp2);
pci_write_config_byte(agp_bridge->dev, INTEL_I845_AGPM, temp2 | (1 << 1));
/* clear any possible error conditions */
- pci_write_config_word(agp_bridge->dev, INTEL_I845_ERRSTS, 0x001c);
+ pci_write_config_word(agp_bridge->dev, INTEL_I845_ERRSTS, 0x001c);
return 0;
}
@@ -1061,23 +1061,23 @@
current_size = A_SIZE_8(agp_bridge->current_size);
/* aperture size */
- pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
+ pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
/* address to map to */
pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
/* attbase - aperture base */
- pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
+ pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
/* agpctrl */
- pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
+ pci_write_config_dword(agp_bridge->dev, INTEL_AGPCTRL, 0x0000);
/* mcgcfg */
pci_read_config_word(agp_bridge->dev, INTEL_I850_MCHCFG, &temp2);
pci_write_config_word(agp_bridge->dev, INTEL_I850_MCHCFG, temp2 | (1 << 9));
/* clear any possible AGP-related error conditions */
- pci_write_config_word(agp_bridge->dev, INTEL_I850_ERRSTS, 0x001c);
+ pci_write_config_word(agp_bridge->dev, INTEL_I850_ERRSTS, 0x001c);
return 0;
}
@@ -1163,7 +1163,7 @@
/* mchcfg */
pci_read_config_word(agp_bridge->dev, INTEL_I7505_MCHCFG, &temp2);
pci_write_config_word(agp_bridge->dev, INTEL_I7505_MCHCFG, temp2 | (1 << 9));
-
+
return 0;
}
@@ -1178,7 +1178,7 @@
{64, 16384, 4, 0},
{32, 8192, 3, 8},
};
-
+
static struct aper_size_info_8 intel_8xx_sizes[7] =
{
{256, 65536, 6, 0},
@@ -1201,7 +1201,7 @@
{4, 1024, 0, 63}
};
-static struct aper_size_info_8 intel_830mp_sizes[4] =
+static struct aper_size_info_8 intel_830mp_sizes[4] =
{
{256, 65536, 6, 0},
{128, 32768, 5, 32},
@@ -1283,7 +1283,7 @@
.owner = THIS_MODULE,
.aperture_sizes = intel_i830_sizes,
.size_type = FIXED_APER_SIZE,
- .num_aperture_sizes = 3,
+ .num_aperture_sizes = 3,
.needs_scratch_page = TRUE,
.configure = intel_i830_configure,
.fetch_size = intel_i830_fetch_size,
@@ -1445,7 +1445,7 @@
.owner = THIS_MODULE,
.aperture_sizes = intel_i830_sizes,
.size_type = FIXED_APER_SIZE,
- .num_aperture_sizes = 3,
+ .num_aperture_sizes = 3,
.needs_scratch_page = TRUE,
.configure = intel_i915_configure,
.fetch_size = intel_i915_fetch_size,
@@ -1489,18 +1489,13 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static int find_i810(u16 device, const char *name)
+static int find_i810(u16 device)
{
struct pci_dev *i810_dev;
i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, device, NULL);
- if (!i810_dev) {
- printk(KERN_ERR PFX "Detected an Intel %s Chipset, "
- "but could not find the secondary device.\n",
- name);
+ if (!i810_dev)
return 0;
- }
-
intel_i810_private.i810_dev = i810_dev;
return 1;
}
@@ -1550,29 +1545,29 @@
name = "440GX";
break;
case PCI_DEVICE_ID_INTEL_82810_MC1:
- if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG1, "i810"))
+ name = "i810";
+ if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG1))
goto fail;
bridge->driver = &intel_810_driver;
- name = "i810";
break;
case PCI_DEVICE_ID_INTEL_82810_MC3:
- if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG3, "i810 DC100"))
+ name = "i810 DC100";
+ if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG3))
goto fail;
bridge->driver = &intel_810_driver;
- name = "i810 DC100";
break;
case PCI_DEVICE_ID_INTEL_82810E_MC:
- if (!find_i810(PCI_DEVICE_ID_INTEL_82810E_IG, "i810 E"))
+ name = "i810 E";
+ if (!find_i810(PCI_DEVICE_ID_INTEL_82810E_IG))
goto fail;
bridge->driver = &intel_810_driver;
- name = "i810 E";
break;
case PCI_DEVICE_ID_INTEL_82815_MC:
/*
* The i815 can operate either as an i810 style
* integrated device, or as an AGP4X motherboard.
*/
- if (find_i810(PCI_DEVICE_ID_INTEL_82815_CGC, "i815"))
+ if (find_i810(PCI_DEVICE_ID_INTEL_82815_CGC))
bridge->driver = &intel_810_driver;
else
bridge->driver = &intel_815_driver;
@@ -1708,7 +1703,10 @@
pci_set_drvdata(pdev, bridge);
return agp_add_bridge(bridge);
- fail:
+
+fail:
+ printk(KERN_ERR PFX "Detected an Intel %s chipset, "
+ "but could not find the secondary device.\n", name);
agp_put_bridge(bridge);
return -ENODEV;
}
@@ -1724,7 +1722,7 @@
static int agp_intel_resume(struct pci_dev *pdev)
{
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
-
+
pci_restore_state(pdev, pdev->saved_config_space);
if (bridge->driver == &intel_generic_driver)
@@ -1741,7 +1739,7 @@
static struct pci_device_id agp_intel_pci_table[] = {
#define ID(x) \
- { \
+ { \
.class = (PCI_CLASS_BRIDGE_HOST << 8), \
.class_mask = ~0, \
.vendor = PCI_VENDOR_ID_INTEL, \
@@ -1769,7 +1767,7 @@
ID(PCI_DEVICE_ID_INTEL_82865_HB),
ID(PCI_DEVICE_ID_INTEL_82875_HB),
ID(PCI_DEVICE_ID_INTEL_7505_0),
- ID(PCI_DEVICE_ID_INTEL_7205_0),
+ ID(PCI_DEVICE_ID_INTEL_7205_0),
{ }
};
diff -Nru a/drivers/char/agp/intel-mch-agp.c b/drivers/char/agp/intel-mch-agp.c
--- a/drivers/char/agp/intel-mch-agp.c 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/intel-mch-agp.c 2004-08-18 23:09:59 -07:00
@@ -633,5 +633,5 @@
module_exit(agp_intelmch_cleanup);
MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
--- a/drivers/char/agp/sis-agp.c 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/sis-agp.c 2004-08-18 23:09:59 -07:00
@@ -169,6 +169,10 @@
.chipset_name = "630",
},
{
+ .device_id = PCI_DEVICE_ID_SI_635,
+ .chipset_name = "635",
+ },
+ {
.device_id = PCI_DEVICE_ID_SI_645,
.chipset_name = "645",
},
diff -Nru a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
--- a/drivers/char/agp/via-agp.c 2004-08-18 23:09:59 -07:00
+++ b/drivers/char/agp/via-agp.c 2004-08-18 23:09:59 -07:00
@@ -503,5 +503,5 @@
module_init(agp_via_init);
module_exit(agp_via_cleanup);
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");