diff options
author | 2006-11-04 22:42:39 -0500 | |
---|---|---|
committer | 2006-11-04 22:42:39 -0500 | |
commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /drivers/video/backlight/hp680_bl.c | |
parent | Input: drivers/char/keyboard.c - small cleanup in k_cur() (diff) | |
parent | Make sure "user->sigpending" count is in sync (diff) | |
download | linux-dev-752c58a471c108d64da1676b2925dfbd83eb177e.tar.xz linux-dev-752c58a471c108d64da1676b2925dfbd83eb177e.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/backlight/hp680_bl.c')
-rw-r--r-- | drivers/video/backlight/hp680_bl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c index fe1488374f62..e3993213d10e 100644 --- a/drivers/video/backlight/hp680_bl.c +++ b/drivers/video/backlight/hp680_bl.c @@ -19,7 +19,7 @@ #include <linux/backlight.h> #include <asm/cpu/dac.h> -#include <asm/hp6xx/hp6xx.h> +#include <asm/hp6xx.h> #include <asm/hd64461.h> #define HP680_MAX_INTENSITY 255 |