projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
mach-iop13xx
/
pci.c
diff --git
a/arch/arm/mach-iop13xx/pci.c
b/arch/arm/mach-iop13xx/pci.c
index 306f82ee57f0a7a7e15e6f50ce34107922d51aa0..9d63d7f260ca5e1150513249d8b917ac4fdf041c 100644
(file)
--- a/
arch/arm/mach-iop13xx/pci.c
+++ b/
arch/arm/mach-iop13xx/pci.c
@@
-19,10
+19,11
@@
#include <linux/pci.h>
#include <linux/delay.h>
-
+#include <linux/jiffies.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/sizes.h>
+#include <asm/signal.h>
#include <asm/mach/pci.h>
#include <asm/arch/pci.h>