Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 503b1a52 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods

parents 4b4f5467 215faf9c

drivers/net/3c501.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ static int mem_start; 
struct net_device * __init el1_probe(int unit)

{

	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));

	static unsigned ports[] = { 0x280, 0x300, 0};

	unsigned *port;

	static const unsigned ports[] = { 0x280, 0x300, 0};

	const unsigned *port;

	int err = 0;



	if (!dev)

drivers/net/3c503.c

+2 −2
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ el2_open(struct net_device *dev) 
    int retval;



    if (dev->irq < 2) {

	int irqlist[] = {5, 9, 3, 4, 0};

	int *irqp = irqlist;

	static const int irqlist[] = {5, 9, 3, 4, 0};

	const int *irqp = irqlist;



	outb(EGACFR_NORM, E33G_GACFR);	/* Enable RAM and interrupts. */

	do {

drivers/net/3c507.c

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ static int mem_start; 
struct net_device * __init el16_probe(int unit)

{

	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));

	static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};

	unsigned *port;

	static const unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};

	const unsigned *port;

	int err = -ENODEV;



	if (!dev)

drivers/net/3c527.c

+3 −3
Original line number Diff line number Diff line
@@ -317,13 +317,13 @@ static int __init mc32_probe1(struct net_device *dev, int slot) 
	u8 POS;

	u32 base;

	struct mc32_local *lp = netdev_priv(dev);

	static u16 mca_io_bases[]={

	static const u16 mca_io_bases[] = {

		0x7280,0x7290,

		0x7680,0x7690,

		0x7A80,0x7A90,

		0x7E80,0x7E90

	};

	static u32 mca_mem_bases[]={

	static const u32 mca_mem_bases[] = {

		0x00C0000,

		0x00C4000,

		0x00C8000,
@@ -333,7 +333,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot) 
		0x00D8000,

		0x00DC000

	};

	static char *failures[]={

	static const char * const failures[] = {

		"Processor instruction",

		"Processor data bus",

		"Processor data bus",

drivers/net/at1700.c

+3 −3
Original line number Diff line number Diff line
@@ -270,9 +270,9 @@ static const struct net_device_ops at1700_netdev_ops = { 


static int __init at1700_probe1(struct net_device *dev, int ioaddr)

{

	char fmv_irqmap[4] = {3, 7, 10, 15};

	char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};

	char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};

	static const char fmv_irqmap[4] = {3, 7, 10, 15};

	static const char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};

	static const char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};

	unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;

	int slot, ret = -ENODEV;

	struct net_local *lp = netdev_priv(dev);