Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f778f56 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung-fixes' of... 

Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
parents bb689266 dc2c8358

arch/arm/mach-exynos/cpuidle.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-s3c64xx/mach-crag6410-module.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/plat-s3c24xx/cpu-freq-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/plat-s5p/sysmmu.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/plat-samsung/include/plat/gpio-cfg.h

+2 −0
Original line number Diff line number Diff line
@@ -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;