Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / apm.c

diff --git a/arch/x86/boot/apm.c b/arch/x86/boot/apm.c
index eab50c55a3a565f626443fffe015fa5ad9c38b04..7aa6033001f9ace30ef1a4ffdb52bfd629a98f26 100644 (file)
--- a/arch/x86/boot/apm.c
+++ b/arch/x86/boot/apm.c
@@ -12,15 +12,11 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/apm.c
- *
  * Get APM BIOS information
  */
 
 #include "boot.h"
 
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-
 int query_apm_bios(void)
 {
        u16 ax, bx, cx, dx, di;
@@ -95,4 +91,3 @@ int query_apm_bios(void)
        return 0;
 }
 
-#endif