diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/arm/mach-iop3xx/iq80331-pci.c | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | linux-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-iop3xx/iq80331-pci.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iq80331-pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-iop3xx/iq80331-pci.c b/arch/arm/mach-iop3xx/iq80331-pci.c index f37a0e26b466..654e450a1311 100644 --- a/arch/arm/mach-iop3xx/iq80331-pci.c +++ b/arch/arm/mach-iop3xx/iq80331-pci.c @@ -13,6 +13,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> |