projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-s3c2410
/
bast-irq.c
diff --git
a/arch/arm/mach-s3c2410/bast-irq.c
b/arch/arm/mach-s3c2410/bast-irq.c
index 379efe70778c6841d4b407d16b3a33c5f66070b5..76a7cb15f3be1b5f268dc85d0690a36a67ee7564 100644
(file)
--- a/
arch/arm/mach-s3c2410/bast-irq.c
+++ b/
arch/arm/mach-s3c2410/bast-irq.c
@@
-24,7
+24,6
@@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/ioport.h>
-#include <linux/ptrace.h>
#include <linux/sysdev.h>
#include <asm/mach-types.h>
#include <linux/sysdev.h>
#include <asm/mach-types.h>
@@
-39,7
+38,7
@@
#include <asm/arch/bast-map.h>
#include <asm/arch/bast-irq.h>
#include <asm/arch/bast-map.h>
#include <asm/arch/bast-irq.h>
-#include
"irq.h"
+#include
<asm/plat-s3c24xx/irq.h>
#if 0
#include <asm/debug-ll.h>
#if 0
#include <asm/debug-ll.h>