From: Paul Mackerras <paulus@samba.org>
Date: Mon, 10 Oct 2005 23:26:48 +0000 (+1000)
Subject: powerpc: Merged asm/backlight.h
X-Git-Tag: v2.6.15-rc1~59^2~196
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=508c40227caee4cef0e963e61a3a5172a108b455;p=linux.git

powerpc: Merged asm/backlight.h

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/include/asm-ppc/backlight.h b/include/asm-powerpc/backlight.h
similarity index 82%
rename from include/asm-ppc/backlight.h
rename to include/asm-powerpc/backlight.h
index 3a1c3dede2a0..1ba1f27a0b63 100644
--- a/include/asm-ppc/backlight.h
+++ b/include/asm-powerpc/backlight.h
@@ -1,12 +1,13 @@
 /*
  * Routines for handling backlight control on PowerBooks
  *
- * For now, implementation resides in arch/ppc/kernel/pmac_support.c
+ * For now, implementation resides in
+ * arch/powerpc/platforms/powermac/pmac_support.c
  *
  */
+#ifndef __ASM_POWERPC_BACKLIGHT_H
+#define __ASM_POWERPC_BACKLIGHT_H
 #ifdef __KERNEL__
-#ifndef __ASM_PPC_BACKLIGHT_H
-#define __ASM_PPC_BACKLIGHT_H
 
 /* Abstract values */
 #define BACKLIGHT_OFF	0
@@ -26,5 +27,5 @@ extern int get_backlight_enable(void);
 extern int set_backlight_level(int level);
 extern int get_backlight_level(void);
 
-#endif
 #endif /* __KERNEL__ */
+#endif