diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-23 20:20:51 +0000 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-23 20:20:51 +0000 |
commit | 74d83b7eedab14e4b963a2220ff76f98fa6d4cb8 (patch) | |
tree | ff4b10ebd9cf1a057c4b1a703732858a539faff7 /drivers/video/omap2/dss/sdi.c | |
parent | [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions (diff) | |
parent | Linux 3.0-rc4 (diff) | |
download | linux-dev-74d83b7eedab14e4b963a2220ff76f98fa6d4cb8.tar.xz linux-dev-74d83b7eedab14e4b963a2220ff76f98fa6d4cb8.zip |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/video/omap2/dss/sdi.c')
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index 54a53e648180..0bd4b0350f80 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c @@ -25,7 +25,7 @@ #include <linux/err.h> #include <linux/regulator/consumer.h> -#include <plat/display.h> +#include <video/omapdss.h> #include <plat/cpu.h> #include "dss.h" |