summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMichal Januszewski <spock@gentoo.org>2006-08-14 10:24:26 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-14 23:54:29 +0400
commit2b25742556b1a351ce4821f6feddcba23bdd930b (patch)
treef3edf7f05895f61c6ef366caa8af1a83b6f76905 /include/linux
parente579dcbf23604cb33c08b5c3c3ac06ca36e7c683 (diff)
downloadlinux-2b25742556b1a351ce4821f6feddcba23bdd930b.tar.xz
[PATCH] fbdev: include backlight.h only when __KERNEL__ is defined
linux/backlight.h pulls in header files (eg. ioport.h) that break compilation of userspace programs. To solve the problem, only include backlight.h in fb.h if compiling kernel stuff. Signed-off-by: Michal Januszewski <spock@gentoo.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 4ad0673b1995..2f335e966011 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -1,7 +1,6 @@
#ifndef _LINUX_FB_H
#define _LINUX_FB_H
-#include <linux/backlight.h>
#include <asm/types.h>
/* Definitions of frame buffers */
@@ -381,6 +380,7 @@ struct fb_cursor {
#include <linux/workqueue.h>
#include <linux/notifier.h>
#include <linux/list.h>
+#include <linux/backlight.h>
#include <asm/io.h>
struct vm_area_struct;