Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (e11ec900) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/3c509.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ static int max_interrupt_work = 10;
		static int nopnp;
		#endif

		static int el3_common_init(struct net_device *dev);
		static int __devinit el3_common_init(struct net_device *dev);
		static void el3_common_remove(struct net_device *dev);
		static ushort id_read_eeprom(int index);
		static ushort read_eeprom(int ioaddr, int index);
		@@ -395,7 +395,7 @@ static struct isa_driver el3_isa_driver = {
		static int isa_registered;

		#ifdef CONFIG_PNP
		static const struct pnp_device_id el3_pnp_ids[] __devinitconst = {
		static struct pnp_device_id el3_pnp_ids[] = {
		{ .id = "TCM5090" }, /* 3Com Etherlink III (TP) */
		{ .id = "TCM5091" }, /* 3Com Etherlink III */
		{ .id = "TCM5094" }, /* 3Com Etherlink III (combo) */
		@@ -478,7 +478,7 @@ static int pnp_registered;
		#endif /* CONFIG_PNP */

		#ifdef CONFIG_EISA
		static const struct eisa_device_id el3_eisa_ids[] __devinitconst = {
		static struct eisa_device_id el3_eisa_ids[] = {
		{ "TCM5090" },
		{ "TCM5091" },
		{ "TCM5092" },
		@@ -508,7 +508,7 @@ static int eisa_registered;
		#ifdef CONFIG_MCA
		static int el3_mca_probe(struct device *dev);

		static const short el3_mca_adapter_ids[] __devinitconst = {
		static short el3_mca_adapter_ids[] __initdata = {
		0x627c,
		0x627d,
		0x62db,
		@@ -517,7 +517,7 @@ static const short el3_mca_adapter_ids[] __devinitconst = {
		0x0000
		};

		static const char *const el3_mca_adapter_names[] __devinitconst = {
		static char *el3_mca_adapter_names[] __initdata = {
		"3Com 3c529 EtherLink III (10base2)",
		"3Com 3c529 EtherLink III (10baseT)",
		"3Com 3c529 EtherLink III (test mode)",
		@@ -601,7 +601,7 @@ static void el3_common_remove (struct net_device *dev)
		}

		#ifdef CONFIG_MCA
		static int __devinit el3_mca_probe(struct device *device)
		static int __init el3_mca_probe(struct device *device)
		{
		/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
		* heavily modified by Chris Beauregard
		@@ -671,7 +671,7 @@ static int __devinit el3_mca_probe(struct device *device)
		#endif /* CONFIG_MCA */

		#ifdef CONFIG_EISA
		static int __devinit el3_eisa_probe (struct device *device)
		static int __init el3_eisa_probe (struct device *device)
		{
		short i;
		int ioaddr, irq, if_port;

drivers/net/3c59x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -901,14 +901,14 @@ static const struct dev_pm_ops vortex_pm_ops = {
		#endif /* !CONFIG_PM */

		#ifdef CONFIG_EISA
		static const struct eisa_device_id vortex_eisa_ids[] __devinitconst = {
		static struct eisa_device_id vortex_eisa_ids[] = {
		{ "TCM5920", CH_3C592 },
		{ "TCM5970", CH_3C597 },
		{ "" }
		};
		MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);

		static int __devinit vortex_eisa_probe(struct device *device)
		static int __init vortex_eisa_probe(struct device *device)
		{
		void __iomem *ioaddr;
		struct eisa_device *edev;

drivers/net/depca.c

+17 −18

Original line number	Diff line number	Diff line
		@@ -331,18 +331,18 @@ static struct {
		"DE422",\
		""}

		static const char* const depca_signature[] __devinitconst = DEPCA_SIGNATURE;
		static char* __initdata depca_signature[] = DEPCA_SIGNATURE;

		enum depca_type {
		DEPCA, de100, de101, de200, de201, de202, de210, de212, de422, unknown
		};

		static const char depca_string[] = "depca";
		static char depca_string[] = "depca";

		static int depca_device_remove (struct device *device);

		#ifdef CONFIG_EISA
		static const struct eisa_device_id depca_eisa_ids[] __devinitconst = {
		static struct eisa_device_id depca_eisa_ids[] = {
		{ "DEC4220", de422 },
		{ "" }
		};
		@@ -367,19 +367,19 @@ static struct eisa_driver depca_eisa_driver = {
		#define DE210_ID 0x628d
		#define DE212_ID 0x6def

		static const short depca_mca_adapter_ids[] __devinitconst = {
		static short depca_mca_adapter_ids[] = {
		DE210_ID,
		DE212_ID,
		0x0000
		};

		static const char *depca_mca_adapter_name[] = {
		static char *depca_mca_adapter_name[] = {
		"DEC EtherWORKS MC Adapter (DE210)",
		"DEC EtherWORKS MC Adapter (DE212)",
		NULL
		};

		static const enum depca_type depca_mca_adapter_type[] = {
		static enum depca_type depca_mca_adapter_type[] = {
		de210,
		de212,
		0
		@@ -541,9 +541,10 @@ static void SetMulticastFilter(struct net_device *dev);
		static int load_packet(struct net_device dev, struct sk_buff skb);
		static void depca_dbg_open(struct net_device *dev);

		static const u_char de1xx_irq[] __devinitconst = { 2, 3, 4, 5, 7, 9, 0 };
		static const u_char de2xx_irq[] __devinitconst = { 5, 9, 10, 11, 15, 0 };
		static const u_char de422_irq[] __devinitconst = { 5, 9, 10, 11, 0 };
		static u_char de1xx_irq[] __initdata = { 2, 3, 4, 5, 7, 9, 0 };
		static u_char de2xx_irq[] __initdata = { 5, 9, 10, 11, 15, 0 };
		static u_char de422_irq[] __initdata = { 5, 9, 10, 11, 0 };
		static u_char *depca_irq;

		static int irq;
		static int io;
		@@ -579,7 +580,7 @@ static const struct net_device_ops depca_netdev_ops = {
		.ndo_validate_addr = eth_validate_addr,
		};

		static int __devinit depca_hw_init (struct net_device dev, struct device device)
		static int __init depca_hw_init (struct net_device dev, struct device device)
		{
		struct depca_private *lp;
		int i, j, offset, netRAM, mem_len, status = 0;
		@@ -747,7 +748,6 @@ static int __devinit depca_hw_init (struct net_device dev, struct device devic
		if (dev->irq < 2) {
		unsigned char irqnum;
		unsigned long irq_mask, delay;
		const u_char *depca_irq;

		irq_mask = probe_irq_on();

		@@ -770,7 +770,6 @@ static int __devinit depca_hw_init (struct net_device dev, struct device devic
		break;

		default:
		depca_irq = NULL;
		break; /* Not reached */
		}

		@@ -1303,7 +1302,7 @@ static void SetMulticastFilter(struct net_device *dev)
		}
		}

		static int __devinit depca_common_init (u_long ioaddr, struct net_device **devp)
		static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
		{
		int status = 0;

		@@ -1334,7 +1333,7 @@ static int __devinit depca_common_init (u_long ioaddr, struct net_device **devp)
		/*
		** Microchannel bus I/O device probe
		*/
		static int __devinit depca_mca_probe(struct device *device)
		static int __init depca_mca_probe(struct device *device)
		{
		unsigned char pos[2];
		unsigned char where;
		@@ -1458,7 +1457,7 @@ static int __devinit depca_mca_probe(struct device *device)
		** ISA bus I/O device probe
		*/

		static void __devinit depca_platform_probe (void)
		static void __init depca_platform_probe (void)
		{
		int i;
		struct platform_device *pldev;
		@@ -1498,7 +1497,7 @@ static void __devinit depca_platform_probe (void)
		}
		}

		static enum depca_type __devinit depca_shmem_probe (ulong *mem_start)
		static enum depca_type __init depca_shmem_probe (ulong *mem_start)
		{
		u_long mem_base[] = DEPCA_RAM_BASE_ADDRESSES;
		enum depca_type adapter = unknown;
		@@ -1559,7 +1558,7 @@ static int __devinit depca_isa_probe (struct platform_device *device)
		*/

		#ifdef CONFIG_EISA
		static int __devinit depca_eisa_probe (struct device *device)
		static int __init depca_eisa_probe (struct device *device)
		{
		enum depca_type adapter = unknown;
		struct eisa_device *edev;
		@@ -1630,7 +1629,7 @@ static int __devexit depca_device_remove (struct device *device)
		** and Boot (readb) ROM. This will also give us a clue to the network RAM
		** base address.
		*/
		static int __devinit DepcaSignature(char *name, u_long base_addr)
		static int __init DepcaSignature(char *name, u_long base_addr)
		{
		u_int i, j, k;
		void __iomem *ptr;

drivers/net/hp100.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -188,14 +188,14 @@ struct hp100_private {
		* variables
		*/
		#ifdef CONFIG_ISA
		static const char *const hp100_isa_tbl[] __devinitconst = {
		static const char *hp100_isa_tbl[] = {
		"HWPF150", /* HP J2573 rev A */
		"HWP1950", /* HP J2573 */
		};
		#endif

		#ifdef CONFIG_EISA
		static const struct eisa_device_id hp100_eisa_tbl[] __devinitconst = {
		static struct eisa_device_id hp100_eisa_tbl[] = {
		{ "HWPF180" }, /* HP J2577 rev A */
		{ "HWP1920" }, /* HP 27248B */
		{ "HWP1940" }, /* HP J2577 */
		@@ -336,7 +336,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
		}

		#ifdef CONFIG_ISA
		static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr)
		static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
		{
		const char *sig;
		int i;
		@@ -372,7 +372,7 @@ static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr)
		* EISA and PCI are handled by device infrastructure.
		*/

		static int __devinit hp100_isa_probe(struct net_device *dev, int addr)
		static int __init hp100_isa_probe(struct net_device *dev, int addr)
		{
		int err = -ENODEV;

		@@ -396,7 +396,7 @@ static int __devinit hp100_isa_probe(struct net_device *dev, int addr)
		#endif /* CONFIG_ISA */

		#if !defined(MODULE) && defined(CONFIG_ISA)
		struct net_device * __devinit hp100_probe(int unit)
		struct net_device * __init hp100_probe(int unit)
		{
		struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
		int err;
		@@ -2843,7 +2843,7 @@ static void cleanup_dev(struct net_device *d)
		}

		#ifdef CONFIG_EISA
		static int __devinit hp100_eisa_probe (struct device *gendev)
		static int __init hp100_eisa_probe (struct device *gendev)
		{
		struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
		struct eisa_device *edev = to_eisa_device(gendev);

drivers/net/ibmlana.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -895,12 +895,12 @@ static int ibmlana_irq;
		static int ibmlana_io;
		static int startslot; /* counts through slots when probing multiple devices */

		static const short ibmlana_adapter_ids[] __devinitconst = {
		static short ibmlana_adapter_ids[] __initdata = {
		IBM_LANA_ID,
		0x0000
		};

		static const char *const ibmlana_adapter_names[] __devinitconst = {
		static char *ibmlana_adapter_names[] __devinitdata = {
		"IBM LAN Adapter/A",
		NULL
		};