Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / net / sunhme.c

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9f046cae2f71627baefd9fc7644952854d148c9d..bd5d2668a36227626b6cefbf0b20eac9b1c8d3a4 100644 (file)
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2221,13 +2221,8 @@ static int happy_meal_open(struct net_device *dev)
                if (request_irq(dev->irq, &happy_meal_interrupt,
                                SA_SHIRQ, dev->name, (void *)dev)) {
                        HMD(("EAGAIN\n"));
-#ifdef __sparc__
-                       printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n",
-                              __irq_itoa(dev->irq));
-#else
                        printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
                               dev->irq);
-#endif
 
                        return -EAGAIN;
                }