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

Commit bd6356bd authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'dev/removing-s5p6442' into for-next

parents 31858479 4b42120d

Documentation/arm/Samsung/Overview.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ Introduction 
  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list

  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list

  - S3C64XX: S3C6400 and S3C6410

  - S3C64XX: S3C6400 and S3C6410

  - S5P6440

  - S5P6440

  - S5P6442

  - S5PC100

  - S5PC100

  - S5PC110 / S5PV210

  - S5PC110 / S5PV210
@@ -36,7 +35,6 @@ Configuration 
  unifying all the SoCs into one kernel.

  unifying all the SoCs into one kernel.





  s5p6440_defconfig - S5P6440 specific default configuration

  s5p6440_defconfig - S5P6440 specific default configuration

  s5p6442_defconfig - S5P6442 specific default configuration

  s5pc100_defconfig - S5PC100 specific default configuration

  s5pc100_defconfig - S5PC100 specific default configuration

  s5pc110_defconfig - S5PC110 specific default configuration

  s5pc110_defconfig - S5PC110 specific default configuration

  s5pv210_defconfig - S5PV210 specific default configuration

  s5pv210_defconfig - S5PV210 specific default configuration

Documentation/flexible-arrays.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -66,10 +66,10 @@ trick is to ensure that any needed memory allocations are done before 
entering atomic context, using:

entering atomic context, using:





    int flex_array_prealloc(struct flex_array *array, unsigned int start,

    int flex_array_prealloc(struct flex_array *array, unsigned int start,

			    unsigned int end, gfp_t flags);

			    unsigned int nr_elements, gfp_t flags);





This function will ensure that memory for the elements indexed in the range

This function will ensure that memory for the elements indexed in the range

defined by start and end has been allocated.  Thereafter, a

defined by start and nr_elements has been allocated.  Thereafter, a

flex_array_put() call on an element in that range is guaranteed not to

flex_array_put() call on an element in that range is guaranteed not to

block.

block.

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 2

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 39

SUBLEVEL = 39

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Flesh-Eating Bats with Fangs

NAME = Flesh-Eating Bats with Fangs





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/Kconfig

+2 −14
Original line number Original line Diff line number Diff line
@@ -736,16 +736,6 @@ config ARCH_S5P64X0 
	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  SMDK6450.

	  SMDK6450.





config ARCH_S5P6442

	bool "Samsung S5P6442"

	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5P6442 CPU based systems



config ARCH_S5PC100

config ARCH_S5PC100

	bool "Samsung S5PC100"

	bool "Samsung S5PC100"

	select GENERIC_GPIO

	select GENERIC_GPIO
@@ -995,8 +985,6 @@ endif 




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

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





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



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

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





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

source "arch/arm/mach-s5pv210/Kconfig"
@@ -1424,7 +1412,7 @@ source kernel/Kconfig.preempt 
config HZ

config HZ

	int

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4

		ARCH_S5PV210 || ARCH_EXYNOS4

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
@@ -2010,7 +1998,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"

source "kernel/power/Kconfig"





config ARCH_SUSPEND_POSSIBLE

config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442

	depends on !ARCH_S5P64X0

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y

	def_bool y

arch/arm/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,6 @@ machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c24 
machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4