Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 86ececd3c658..ef2014375e62 100644
--- 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) {
@@ -204,10 +204,10 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         ei_status.rx_start_page = HP_START_PG + TX_PAGES;
         ei_status.stop_page = wordmode ? HP_16BSTOP_PG : HP_8BSTOP_PG;
 
-        ei_status.reset_8390 = &hp_reset_8390;
-        ei_status.get_8390_hdr = &hp_get_8390_hdr;
-        ei_status.block_input = &hp_block_input;
-        ei_status.block_output = &hp_block_output;
+        ei_status.reset_8390 = hp_reset_8390;
+        ei_status.get_8390_hdr = hp_get_8390_hdr;
+        ei_status.block_input = hp_block_input;
+        ei_status.block_output = hp_block_output;
         hp_init_card(dev);
 
         retval = register_netdev(dev);