diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-03-29 15:12:44 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:34:02 -0500 |
| commit | 5d4fe2c1ce83c3e967ccc1ba3d580c1a5603a866 (patch) | |
| tree | dbadab717d643708ed140eb72fa3b132eefa56ba /drivers/net/ixp2000 | |
| parent | 391fc09a143aac08d1a3dc37b60238612b504ad3 (diff) | |
| download | op-kernel-dev-5d4fe2c1ce83c3e967ccc1ba3d580c1a5603a866.zip op-kernel-dev-5d4fe2c1ce83c3e967ccc1ba3d580c1a5603a866.tar.gz | |
[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>
Diffstat (limited to 'drivers/net/ixp2000')
| -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 77f104a..fbc2d21 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, 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); |
