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

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

Merge branch 'next-s3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

parents dca230f0 01875d56

arch/arm/mach-s3c2410/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ config ARCH_H1940 
	select CPU_S3C2410

	select PM_H1940 if PM

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the HP IPAQ H1940
@@ -89,6 +90,7 @@ config MACH_N30 
	bool "Acer N30 family"

	select CPU_S3C2410

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you want suppt for the Acer N30, Acer N35,

	  Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
@@ -103,6 +105,7 @@ config ARCH_BAST 
	select S3C24XX_DCLK

	select ISA

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the Simtec Electronics EB2410ITX

	  development board (also known as BAST)
@@ -111,6 +114,7 @@ config MACH_OTOM 
 	bool "NexVision OTOM Board"

 	select CPU_S3C2410

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

 	  Say Y here if you are using the Nex Vision OTOM board
@@ -154,6 +158,7 @@ config MACH_QT2410 
	bool "QT2410"

	select CPU_S3C2410

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	   Say Y here if you are using the Armzone QT2410

arch/arm/mach-s3c2412/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config MACH_JIVE 
	bool "Logitech Jive"

	select CPU_S3C2412

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the Logitech Jive.
@@ -61,6 +62,7 @@ config MACH_SMDK2413 
	select MACH_S3C2413

	select MACH_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an SMDK2413
@@ -84,6 +86,7 @@ config MACH_VSTMS 
	bool "VMSTMS"

	select CPU_S3C2412

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an VSTMS board

arch/arm/mach-s3c2440/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config MACH_OSIRIS 
	select S3C2440_XTAL_12000000

	select S3C2410_IOTIMING if S3C2440_CPUFREQ

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the Simtec IM2440D20 module, also

	  known as the Osiris.
@@ -57,6 +58,7 @@ config MACH_RX3715 
	select CPU_S3C2440

	select S3C2440_XTAL_16934400

	select PM_H1940 if PM

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the HP iPAQ rx3715.
@@ -66,6 +68,7 @@ config ARCH_S3C2440 
	select S3C2440_XTAL_16934400

	select MACH_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the SMDK2440.
@@ -74,6 +77,7 @@ config MACH_NEXCODER_2440 
 	select CPU_S3C2440

	select S3C2440_XTAL_12000000

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

 	  Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
@@ -88,6 +92,7 @@ config MACH_AT2440EVB 
	bool "Avantech AT2440EVB development board"

	select CPU_S3C2440

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the AT2440EVB development board
@@ -97,6 +102,7 @@ config MACH_MINI2440 
	select EEPROM_AT24

	select LEDS_TRIGGER_BACKLIGHT

	select SND_S3C24XX_SOC_S3C24XX_UDA134X

	select S3C_DEV_NAND

	help

	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board

	  available via various sources. It can come with a 3.5" or 7" touch LCD.

arch/arm/mach-s3c6400/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config MACH_SMDK6400 
       bool "SMDK6400"

	select CPU_S3C6400

	select S3C_DEV_HSMMC

	select S3C_DEV_NAND

	select S3C6400_SETUP_SDHCI

	help

	  Machine support for the Samsung SMDK6400

arch/arm/mach-s3c6410/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config MACH_HMT 
	bool "Airgoo HMT"

	select CPU_S3C6410

	select S3C_DEV_FB

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	select S3C64XX_SETUP_FB_24BPP

	select HAVE_PWM