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

Commit d472d1a1 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable 

Conflicts:
	arch/arm/Kconfig
parents 9bfe99a8 d01cd639

arch/arm/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ config ARCH_S5P6440 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S5P6440 CPU based systems
@@ -679,17 +680,19 @@ config ARCH_S5P6442 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S5P6442 CPU based systems



config ARCH_S5PC1XX

	bool "Samsung S5PC1XX"

config ARCH_S5PC100

	bool "Samsung S5PC100"

	select GENERIC_GPIO

	select HAVE_CLK

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S5PC1XX series based systems

	  Samsung S5PC100 series based systems



config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"
@@ -697,6 +700,7 @@ config ARCH_S5PV210 
	select GENERIC_GPIO

	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	help

	  Samsung S5PV210/S5PC110 series based systems
@@ -876,7 +880,7 @@ source "arch/arm/mach-sa1100/Kconfig" 
source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s5p/Kconfig"

source "arch/arm/plat-s5pc1xx/Kconfig"



source "arch/arm/plat-spear/Kconfig"



if ARCH_S3C2410
@@ -896,9 +900,7 @@ source "arch/arm/mach-s5p6440/Kconfig" 


source "arch/arm/mach-s5p6442/Kconfig"



if ARCH_S5PC1XX

source "arch/arm/mach-s5pc100/Kconfig"

endif



source "arch/arm/mach-s5pv210/Kconfig"

arch/arm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 
machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark
@@ -198,7 +198,6 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik 
plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile