Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 09f03f493beab1827295482f70a5138ddaeb0d81..fbc2d21020f4ee9ac2cca49a5b3b3d7764a9a9fe 100644 (file)
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -16,7 +16,7 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
 #include "ixp2400_rx.ucode"
@@ -299,10 +299,7 @@ int ixpdev_init(int __nds_count, struct net_device **__nds,
        int i;
        int err;
 
-       if (RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192) {
-               static void __too_many_rx_or_tx_buffers(void);
-               __too_many_rx_or_tx_buffers();
-       }
+       BUILD_BUG_ON(RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192);
 
        printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION);