Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / hp.c

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index d15d2f2ba78ec84cc9e6e73d0898f4d0b20e745c..ef2014375e62c3d17268cdac5c7ad3f046b1e1e7 100644 (file)
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -162,9 +162,9 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
 
        /* Snarf the interrupt now.  Someday this could be moved to open(). */
        if (dev->irq < 2) {
-               int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
-               int irq_8list[] = { 7, 5, 3, 4, 9, 0};
-               int *irqp = wordmode ? irq_16list : irq_8list;
+               static const int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
+               static const int irq_8list[] = { 7, 5, 3, 4, 9, 0};
+               const int *irqp = wordmode ? irq_16list : irq_8list;
                do {
                        int irq = *irqp;
                        if (request_irq (irq, NULL, 0, "bogus", NULL) != -EBUSY) {