diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-29 15:31:30 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-29 15:31:30 +1100 |
commit | 5e95ec9b85ca46b9cbed200c1f3c568a2882d3c1 (patch) | |
tree | 64e8114adaa61cf3c386a163cc0a14329602e19f /drivers/video/mbx | |
parent | f59948651e56546118410f1bd2fa6bc1090ba0c0 (diff) | |
parent | 575b5e885d4bf2917fd0f448ee3684dc00086885 (diff) |
Merge branch 'init/master'
Diffstat (limited to 'drivers/video/mbx')
-rw-r--r-- | drivers/video/mbx/mbxfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c index f0a5392f5fd3..30a05119ed50 100644 --- a/drivers/video/mbx/mbxfb.c +++ b/drivers/video/mbx/mbxfb.c @@ -22,7 +22,6 @@ #include <linux/delay.h> #include <linux/fb.h> -#include <linux/init.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/uaccess.h> |