compile error in 2.5.48

[Thomas Molina]

I get the following compile error:

[tmolina@lap linux-2.5-tm]$ make bzImage > makeimage
arch/i386/kernel/apm.c:336:1: warning: "savesegment" redefined
In file included from include/linux/elf.h:5,
                 from include/linux/module.h:17,
                 from arch/i386/kernel/apm.c:205:
include/asm/elf.h:63:1: warning: this is the location of the previous definition

in apm.c it is:

#define savesegment(seg, where) \
                __asm__ __volatile__("movl %%" #seg ",%0" : "=m" (where))
 

in elf.h 

#define savesegment(seg,value) \
        asm volatile("movl %%" #seg ",%0":"=m" (*(int *)&(value)))

Is there any reason we can't just do the following:
--- arch/i386/kernel/apm.c.orig	2002-11-20 18:13:04.000000000 -0600
+++ arch/i386/kernel/apm.c	2002-11-20 18:16:16.000000000 -0600
@@ -331,12 +331,6 @@
 #define DEFAULT_BOUNCE_INTERVAL		(3 * HZ)
 
 /*
- * Save a segment register away
- */
-#define savesegment(seg, where) \
-		__asm__ __volatile__("movl %%" #seg ",%0" : "=m" (where))
-
-/*
  * Maximum number of events stored
  */
 #define APM_MAX_EVENTS		20