bk://linux-dj.bkbits.net/agpgart davej@delerium.codemonkey.org.uk|ChangeSet|20040608162641|38140 davej # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/06/06 13:56:07+01:00 davej@redhat.com # [AGPGART] Kconfig Typo fix # From: Tuncer M zayamut Ayaz # Signed-off-by: Dave Jones # # drivers/char/agp/Kconfig # 2004/06/06 13:55:59+01:00 davej@redhat.com +1 -1 # [AGPGART] Kconfig Typo fix # From: Tuncer M zayamut Ayaz # Signed-off-by: Dave Jones # # ChangeSet # 2004/06/03 10:16:23-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # include/linux/pci_ids.h # 2004/06/03 10:16:20-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/06/02 13:13:23-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # include/linux/pci_ids.h # 2004/06/02 13:13:19-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/06/01 11:02:53-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/06/01 11:02:49-07:00 akpm@bix.(none) +1 -0 # Auto merged # # ChangeSet # 2004/05/28 16:57:21-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # include/linux/pci_ids.h # 2004/05/28 16:57:18-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/28 13:14:32-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-agpgart # # include/linux/pci_ids.h # 2004/05/28 13:14:29-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/24 11:19:17-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/05/24 11:19:14-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-06-08 21:31:58 -07:00 +++ b/drivers/char/agp/Kconfig 2004-06-08 21:31:58 -07:00 @@ -165,7 +165,7 @@ tristate "Transmeta Efficeon support" depends on AGP && X86 && !X86_64 help - This option fives you AGP support for the Transmeta Efficeon + This option gives you AGP support for the Transmeta Efficeon series processors with integrated northbridges. You should say Y here if you use XFree86 3.3.6 or 4.x and want to diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h 2004-06-08 21:31:58 -07:00 +++ b/include/linux/pci_ids.h 2004-06-08 21:31:58 -07:00 @@ -2012,6 +2012,7 @@ #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 #define PCI_DEVICE_ID_INTEL_82092AA_1 0x1222 #define PCI_DEVICE_ID_INTEL_7116 0x1223 +#define PCI_DEVICE_ID_INTEL_7501_0 0x254c #define PCI_DEVICE_ID_INTEL_7505_0 0x2550 #define PCI_DEVICE_ID_INTEL_7505_1 0x2552 #define PCI_DEVICE_ID_INTEL_7205_0 0x255d