diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-17 16:07:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-17 16:07:43 +1000 |
| commit | eda485f06d17f98bd58559fb5dd331951ffd1608 (patch) | |
| tree | c76f119e68734932c6751cd14fdd420544da92c3 /arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |
| parent | 6b5e7229bbd59f0cfce7015fd46736fc93d8c8c3 (diff) | |
| parent | 9a5d5bd8480068c5829e3d997ee21dab9b3ed05f (diff) | |
| download | op-kernel-dev-eda485f06d17f98bd58559fb5dd331951ffd1608.zip op-kernel-dev-eda485f06d17f98bd58559fb5dd331951ffd1608.tar.gz | |
Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next
Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/arm/mach-kirkwood/db88f6281-bp-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index d933593..be90b7d 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c @@ -10,6 +10,7 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/sizes.h> #include <linux/platform_device.h> #include <linux/mtd/partitions.h> #include <linux/ata_platform.h> |
