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

This project is archived. Its data is read-only.

Commit 8ea3f0af authored Oct 09, 2010 by Linus Torvalds

Merge branch 's5p-fixes-for-linus' of...

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Add a workaround for get_clock() for serial driver
  ARM: S5P: Bug fix on errors of build with CONFIG_PREEMPT_NONE
  ARM: SAMSUNG: Fix build warnings because of unused codes

parents e92ba6d2 7cf4b482

arch/arm/mach-s5p6440/cpu.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <linux/sysdev.h>		#include <linux/sysdev.h>
	#include <linux/serial_core.h>		#include <linux/serial_core.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
			#include <linux/sched.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

arch/arm/mach-s5p6442/cpu.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <linux/sysdev.h>		#include <linux/sysdev.h>
	#include <linux/serial_core.h>		#include <linux/serial_core.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
			#include <linux/sched.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

arch/arm/mach-s5pc100/cpu.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include <linux/sysdev.h>		#include <linux/sysdev.h>
	#include <linux/serial_core.h>		#include <linux/serial_core.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
			#include <linux/sched.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

arch/arm/mach-s5pv210/clock.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -173,11 +173,6 @@ static int s5pv210_clk_ip3_ctrl(struct clk *clk, int enable)
	return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable);		return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable);
	}		}

	static int s5pv210_clk_ip4_ctrl(struct clk *clk, int enable)
	{
	return s5p_gatectrl(S5P_CLKGATE_IP4, clk, enable);
	}

	static int s5pv210_clk_mask0_ctrl(struct clk *clk, int enable)		static int s5pv210_clk_mask0_ctrl(struct clk *clk, int enable)
	{		{
	return s5p_gatectrl(S5P_CLK_SRC_MASK0, clk, enable);		return s5p_gatectrl(S5P_CLK_SRC_MASK0, clk, enable);

arch/arm/mach-s5pv210/cpu.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/sysdev.h>		#include <linux/sysdev.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
			#include <linux/sched.h>

	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>