summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop3xx/iq80321-pci.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 22:38:55 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 22:38:55 +0300
commit328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch)
tree9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /arch/arm/mach-iop3xx/iq80321-pci.c
parent9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff)
parentfecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff)
downloadlinux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-iop3xx/iq80321-pci.c')
-rw-r--r--arch/arm/mach-iop3xx/iq80321-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-iop3xx/iq80321-pci.c b/arch/arm/mach-iop3xx/iq80321-pci.c
index 79fea3d20b66..802f6d091b75 100644
--- a/arch/arm/mach-iop3xx/iq80321-pci.c
+++ b/arch/arm/mach-iop3xx/iq80321-pci.c
@@ -14,6 +14,8 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>