diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:22:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:22:37 +0000 |
| commit | 4f778f56ee4f399439e401d45c1a76d72120a1f3 (patch) | |
| tree | f631adac6f956c2a0cde72c41d2e02b7a3e8bccb | |
| parent | bb68926609f411c258d6946f7680e009625ab950 (diff) | |
| parent | dc2c83582eac2682808b80e9dce7d2cac2b20596 (diff) | |
| download | linux-3.10-4f778f56ee4f399439e401d45c1a76d72120a1f3.tar.gz linux-3.10-4f778f56ee4f399439e401d45c1a76d72120a1f3.tar.bz2 linux-3.10-4f778f56ee4f399439e401d45c1a76d72120a1f3.zip | |
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/cpu-freq-debugfs.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/sysmmu.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pd.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pwm.c | 2 |
7 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 35f6502144a..4ebb382c597 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -12,6 +12,8 @@ #include <linux/init.h> #include <linux/cpuidle.h> #include <linux/io.h> +#include <linux/export.h> +#include <linux/time.h> #include <asm/proc-fns.h> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 66668565ee7..f208154b138 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -#include <linux/module.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/i2c.h> diff --git a/arch/arm/plat-s3c24xx/cpu-freq-debugfs.c b/arch/arm/plat-s3c24xx/cpu-freq-debugfs.c index a9276667c2f..c7adad0e8de 100644 --- a/arch/arm/plat-s3c24xx/cpu-freq-debugfs.c +++ b/arch/arm/plat-s3c24xx/cpu-freq-debugfs.c @@ -12,7 +12,7 @@ */ #include <linux/init.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/cpufreq.h> diff --git a/arch/arm/plat-s5p/sysmmu.c b/arch/arm/plat-s5p/sysmmu.c index e1cbc728c77..c8bec9c7655 100644 --- a/arch/arm/plat-s5p/sysmmu.c +++ b/arch/arm/plat-s5p/sysmmu.c @@ -11,6 +11,7 @@ #include <linux/io.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/export.h> #include <asm/pgtable.h> diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h index d48245bb02b..df8155b9d4d 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h +++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h @@ -24,6 +24,8 @@ #ifndef __PLAT_GPIO_CFG_H #define __PLAT_GPIO_CFG_H __FILE__ +#include<linux/types.h> + typedef unsigned int __bitwise__ samsung_gpio_pull_t; typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; diff --git a/arch/arm/plat-samsung/pd.c b/arch/arm/plat-samsung/pd.c index efe1d564473..312b510d86b 100644 --- a/arch/arm/plat-samsung/pd.c +++ b/arch/arm/plat-samsung/pd.c @@ -11,7 +11,7 @@ */ #include <linux/init.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/platform_device.h> #include <linux/err.h> #include <linux/pm_runtime.h> diff --git a/arch/arm/plat-samsung/pwm.c b/arch/arm/plat-samsung/pwm.c index dc1185dcf80..c559d8438c7 100644 --- a/arch/arm/plat-samsung/pwm.c +++ b/arch/arm/plat-samsung/pwm.c @@ -11,7 +11,7 @@ * the Free Software Foundation; either version 2 of the License. */ -#include <linux/module.h> +#include <linux/export.h> #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/slab.h> |