aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/pmag-ba-fb.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch)
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/video/pmag-ba-fb.c
parent8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff)
parentad71f123a9e9b809f6c829db1222ce0423a1153c (diff)
Merge ../powerpc-merge
Diffstat (limited to 'drivers/video/pmag-ba-fb.c')
-rw-r--r--drivers/video/pmag-ba-fb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index f3927b6cda9..f5361cd8ccc 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -30,7 +30,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <asm/bug.h>
#include <asm/io.h>
#include <asm/system.h>