summaryrefslogtreecommitdiff
path: root/drivers/video/omap/dispc.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-11-22 00:55:59 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-11-22 00:55:59 +0000
commit50084842cc24b69c7d1cccb20c737ee611dc9c5a (patch)
tree0bd330175ef491bfcee680ad8d99aac5b900720c /drivers/video/omap/dispc.c
parent74a0efdef1df7f576116811234ebedd8a1255ebc (diff)
parentf95cb5ebd834117ff4829a460656095a0ae63921 (diff)
Merge branch 'for-3.2-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
Diffstat (limited to 'drivers/video/omap/dispc.c')
-rw-r--r--drivers/video/omap/dispc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 0ccd7adf47bb..6f61e781f15a 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -19,6 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>