diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 17:03:23 +0200 |
commit | 25fbe5ca4d0f37170451b682bd150a70f944aca0 (patch) | |
tree | c23f80847119d9f297206a37af2ad548ccdde802 /arch/arm/plat-iop | |
parent | ff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 (diff) | |
download | kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.zip kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.gz kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.bz2 |
update other arm platforms from 3.2.72 and also merge some general arm code (boot)
Diffstat (limited to 'arch/arm/plat-iop')
-rw-r--r-- | arch/arm/plat-iop/gpio.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-iop/pci.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-iop/time.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-iop/gpio.c b/arch/arm/plat-iop/gpio.c index 640e498..e4de9be 100644 --- a/arch/arm/plat-iop/gpio.c +++ b/arch/arm/plat-iop/gpio.c @@ -15,6 +15,7 @@ #include <linux/types.h> #include <linux/errno.h> #include <linux/gpio.h> +#include <linux/export.h> #include <asm/hardware/iop3xx.h> void gpio_line_config(int line, int direction) diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index 43f2b15..845549c 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c @@ -374,6 +374,9 @@ void __init iop3xx_pci_preinit_cond(void) void __init iop3xx_pci_preinit(void) { + pcibios_min_io = 0; + pcibios_min_mem = 0; + iop3xx_atu_disable(); iop3xx_atu_setup(); iop3xx_atu_debug(); diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 7cdc516..568dd02 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -22,6 +22,7 @@ #include <linux/io.h> #include <linux/clocksource.h> #include <linux/clockchips.h> +#include <linux/export.h> #include <mach/hardware.h> #include <asm/irq.h> #include <asm/sched_clock.h> |