diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-03-29 08:12:44 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:34:02 -0500 |
commit | 5d4fe2c1ce83c3e967ccc1ba3d580c1a5603a866 (patch) | |
tree | dbadab717d643708ed140eb72fa3b132eefa56ba | |
parent | 391fc09a143aac08d1a3dc37b60238612b504ad3 (diff) |
[PATCH] ixp2000: fix gcc4 breakage
gcc4 doesn't like us declaring a static function inside another
function. We can do away with this construct altogether and use
BUILD_BUG_ON() instead (idea from Andi Kleen.)
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 77f104a005f3..fbc2d21020f4 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -299,10 +299,7 @@ int ixpdev_init(int __nds_count, struct net_device **__nds, | |||
299 | int i; | 299 | int i; |
300 | int err; | 300 | int err; |
301 | 301 | ||
302 | if (RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192) { | 302 | BUILD_BUG_ON(RX_BUF_COUNT > 192 || TX_BUF_COUNT > 192); |
303 | static void __too_many_rx_or_tx_buffers(void); | ||
304 | __too_many_rx_or_tx_buffers(); | ||
305 | } | ||
306 | 303 | ||
307 | printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION); | 304 | printk(KERN_INFO "IXP2000 MSF ethernet driver %s\n", DRV_MODULE_VERSION); |
308 | 305 | ||