Merge pobox.com:/garz/repo/netdev-2.6/initdata-fixes

into pobox.com:/garz/repo/net-drivers-2.6

drivers/net/tulip/de2104x.c

@@ -1927,7 +1927,7 @@ static void __init de21041_get_srom_info (struct de_private *de)
 	goto fill_defaults;
 }
 
-static int __devinit de_init_one (struct pci_dev *pdev,
+static int __init de_init_one (struct pci_dev *pdev,
 				  const struct pci_device_id *ent)
 {
 	struct net_device *dev;

drivers/net/wan/sbni.c

@@ -176,7 +176,7 @@ static u32	mac[  SBNI_MAX_NUM_CARDS ] __initdata;
 
 #ifndef MODULE
 typedef u32  iarr[];
-static iarr  *dest[5] = { &io, &irq, &baud, &rxl, &mac };
+static iarr __initdata *dest[5] = { &io, &irq, &baud, &rxl, &mac };
 #endif
 
 /* A zero-terminated list of I/O addresses to be probed on ISA bus */