diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:11 +0100 |
| commit | d87f69a16eb2cb96459117b06949a560679002e4 (patch) | |
| tree | bbb55b2bd2b6c9e8bd4067aa3279783cb6bd9028 /arch/mips/pci/pci-alchemy.c | |
| parent | 124ba9403318d834ef21bcd899c22c870708d2c4 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
| download | linux-d87f69a16eb2cb96459117b06949a560679002e4.tar.gz linux-d87f69a16eb2cb96459117b06949a560679002e4.tar.bz2 linux-d87f69a16eb2cb96459117b06949a560679002e4.zip | |
Merge commit 'v3.2-rc6' into perf/core
Merge reason: Update with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/pci/pci-alchemy.c')
| -rw-r--r-- | arch/mips/pci/pci-alchemy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c index 4ee57104e47b..b5ce041cdafb 100644 --- a/arch/mips/pci/pci-alchemy.c +++ b/arch/mips/pci/pci-alchemy.c @@ -7,6 +7,7 @@ * Support for all devices (greater than 16) added by David Gathright. */ +#include <linux/export.h> #include <linux/types.h> #include <linux/pci.h> #include <linux/platform_device.h> |