summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-11 09:26:48 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-11 09:59:38 +1000
commit508c40227caee4cef0e963e61a3a5172a108b455 (patch)
tree2cec3435f5fec2f088d41d0d3f07dea54b278646
parent20f629549b30a1154c8b5e830cb10a0c0faa875f (diff)
downloadlinux-stable-508c40227caee4cef0e963e61a3a5172a108b455.tar.gz
linux-stable-508c40227caee4cef0e963e61a3a5172a108b455.tar.bz2
linux-stable-508c40227caee4cef0e963e61a3a5172a108b455.zip
powerpc: Merged asm/backlight.h
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--include/asm-powerpc/backlight.h (renamed from include/asm-ppc/backlight.h)9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-ppc/backlight.h b/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