diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-07 21:27:23 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 21:27:23 +0100 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/alpha/kernel | |
| parent | ARM: OMAP2: Fix H4 matrix keyboard warning (diff) | |
| parent | ARM: OMAP: Fix export.h or module.h includes (diff) | |
| download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/core_irongate.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/pci-sysfs.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/pci_iommu.c | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/setup.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index a872078497be..00096df0f6ad 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -303,6 +303,7 @@ irongate_init_arch(void) #include <linux/vmalloc.h> #include <linux/agp_backend.h> #include <linux/agpgart.h> +#include <linux/export.h> #include <asm/pgalloc.h> #define GET_PAGE_DIR_OFF(addr) (addr >> 22) diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c index b899e95f79fd..53649c7d0068 100644 --- a/arch/alpha/kernel/pci-sysfs.c +++ b/arch/alpha/kernel/pci-sysfs.c @@ -10,6 +10,7 @@ */ #include <linux/sched.h> +#include <linux/stat.h> #include <linux/slab.h> #include <linux/pci.h> diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 022c2748fa41..43610804987d 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -7,6 +7,7 @@ #include <linux/pci.h> #include <linux/gfp.h> #include <linux/bootmem.h> +#include <linux/export.h> #include <linux/scatterlist.h> #include <linux/log2.h> #include <linux/dma-mapping.h> diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index cc0fd862cf26..32de56067e63 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -43,6 +43,7 @@ #include <asm/setup.h> #include <asm/io.h> #include <linux/log2.h> +#include <linux/export.h> extern struct atomic_notifier_head panic_notifier_list; static int alpha_panic_event(struct notifier_block *, unsigned long, void *); |