aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 11:10:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 11:10:03 -0500
commiteafa6cb18ec7e5424ce54017b5ce6d11dff58b79 (patch)
treed930417cd7d252fe171663aecd9229d19d42aa99 /drivers
parent612b322ade7954a1d984fa410a70d4ae50f75c0d (diff)
parent4731f2dfd5049b7a2b3b5a7131525f6151855f0d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Titan defconfig update. sh: Fix IPR-IRQ's for IRQ-chip change breakage. sh: Update r7780rp_defconfig. video: Fix include in hp680_bl. sh: Wire up new syscalls.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/backlight/hp680_bl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index fe1488374f6..e3993213d10 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -19,7 +19,7 @@
19#include <linux/backlight.h> 19#include <linux/backlight.h>
20 20
21#include <asm/cpu/dac.h> 21#include <asm/cpu/dac.h>
22#include <asm/hp6xx/hp6xx.h> 22#include <asm/hp6xx.h>
23#include <asm/hd64461.h> 23#include <asm/hd64461.h>
24 24
25#define HP680_MAX_INTENSITY 255 25#define HP680_MAX_INTENSITY 255