Fix AGP device ID's - make them static, and fix bad ATI name confusion.

drivers/char/agp/ali-agp.c

@@ -231,7 +231,7 @@ struct agp_bridge_driver ali_m1541_bridge = {
 };
 
 
-struct agp_device_ids ali_agp_device_ids[] __initdata =
+static struct agp_device_ids ali_agp_device_ids[] __initdata =
 {
 	{
 		.device_id	= PCI_DEVICE_ID_AL_M1541,

drivers/char/agp/amd-k7-agp.c

@@ -365,7 +365,7 @@ struct agp_bridge_driver amd_irongate_driver = {
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_device_ids amd_agp_device_ids[] __initdata =
+static struct agp_device_ids amd_agp_device_ids[] __initdata =
 {
 	{
 		.device_id	= PCI_DEVICE_ID_AMD_FE_GATE_7006,

drivers/char/agp/ati-agp.c

@@ -405,7 +405,7 @@ struct agp_bridge_driver ati_generic_bridge = {
 };
 
 
-struct agp_device_ids ali_agp_device_ids[] __initdata =
+static struct agp_device_ids ati_agp_device_ids[] __initdata =
 {
 	{
 		.device_id	= PCI_DEVICE_ID_ATI_RS100,
@@ -441,7 +441,7 @@ struct agp_device_ids ali_agp_device_ids[] __initdata =
 static int __init agp_ati_probe(struct pci_dev *pdev,
 				const struct pci_device_id *ent)
 {
-	struct agp_device_ids *devs = ali_agp_device_ids;
+	struct agp_device_ids *devs = ati_agp_device_ids;
 	struct agp_bridge_data *bridge;
 	u8 cap_ptr;
 	int j;

drivers/char/agp/sis-agp.c

@@ -95,7 +95,7 @@ struct agp_bridge_driver sis_driver = {
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_device_ids sis_agp_device_ids[] __initdata =
+static struct agp_device_ids sis_agp_device_ids[] __initdata =
 {
 	{
 		.device_id	= PCI_DEVICE_ID_SI_530,

drivers/char/agp/uninorth-agp.c

@@ -282,7 +282,7 @@ struct agp_bridge_driver uninorth_agp_driver = {
 	.cant_use_aperture	= 1,
 };
 
-struct agp_device_ids uninorth_agp_device_ids[] __initdata = {
+static struct agp_device_ids uninorth_agp_device_ids[] __initdata = {
 	{
 		.device_id	= PCI_DEVICE_ID_APPLE_UNI_N_AGP,
 		.chipset_name	= "UniNorth",