summaryrefslogtreecommitdiff
path: root/drivers/video/bt431.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 01:13:01 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 01:13:01 -0700
commite644dae645e167d154c0526358940986682a72b0 (patch)
tree972993c6568085b8d407fc7e13de10f4b93c651d /drivers/video/bt431.h
parent899c612d74d4a242158a4db20367388d6299c028 (diff)
parent86809173ce32ef03bd4d0389dfc72df0c805e9c4 (diff)
downloadlwn-e644dae645e167d154c0526358940986682a72b0.tar.gz
lwn-e644dae645e167d154c0526358940986682a72b0.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/video/bt431.h')
-rw-r--r--drivers/video/bt431.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/bt431.h b/drivers/video/bt431.h
index c826f2787bad..04e0cfbba538 100644
--- a/drivers/video/bt431.h
+++ b/drivers/video/bt431.h
@@ -8,7 +8,6 @@
* archive for more details.
*/
#include <linux/types.h>
-#include <asm/system.h>
/*
* Bt431 cursor generator registers, 32-bit aligned.