From 4ba4a015fe629ce59f308b4392af8e428f80a224 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 14 Aug 2006 11:24:34 +0200 Subject: [GCC4] fix build in drivers/atm/horizon.c This patches fixes this error with gcc 4 (encountered on PPC) : horizon.c:484: error: conflicting types for 'dump_regs' /tmp/linux-2.4.33/include/asm/system.h:96: error: previous declaration of 'dump_regs' was here --- drivers/atm/horizon.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index dc902ac..15b8caf 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c @@ -481,6 +481,7 @@ #endif return; } +#if 0 /* unused and in conflict with */ static inline void dump_regs (hrz_dev * dev) { #ifdef DEBUG_HORIZON PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG)); @@ -494,6 +495,7 @@ #else #endif return; } +#endif static inline void dump_framer (hrz_dev * dev) { #ifdef DEBUG_HORIZON -- 1.4.2