Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable (d472d1a1) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm/Kconfig

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -671,6 +671,7 @@ config ARCH_S5P6440
	select CPU_V6		select CPU_V6
	select GENERIC_GPIO		select GENERIC_GPIO
	select HAVE_CLK		select HAVE_CLK
			select ARCH_USES_GETTIMEOFFSET
	help		help
	Samsung S5P6440 CPU based systems		Samsung S5P6440 CPU based systems

	@@ -679,17 +680,19 @@ config ARCH_S5P6442
	select CPU_V6		select CPU_V6
	select GENERIC_GPIO		select GENERIC_GPIO
	select HAVE_CLK		select HAVE_CLK
			select ARCH_USES_GETTIMEOFFSET
	help		help
	Samsung S5P6442 CPU based systems		Samsung S5P6442 CPU based systems

	config ARCH_S5PC1XX		config ARCH_S5PC100
	bool "Samsung S5PC1XX"		bool "Samsung S5PC100"
	select GENERIC_GPIO		select GENERIC_GPIO
	select HAVE_CLK		select HAVE_CLK
	select CPU_V7		select CPU_V7
	select ARM_L1_CACHE_SHIFT_6		select ARM_L1_CACHE_SHIFT_6
			select ARCH_USES_GETTIMEOFFSET
	help		help
	Samsung S5PC1XX series based systems		Samsung S5PC100 series based systems

	config ARCH_S5PV210		config ARCH_S5PV210
	bool "Samsung S5PV210/S5PC110"		bool "Samsung S5PV210/S5PC110"
	@@ -697,6 +700,7 @@ config ARCH_S5PV210
	select GENERIC_GPIO		select GENERIC_GPIO
	select HAVE_CLK		select HAVE_CLK
	select ARM_L1_CACHE_SHIFT_6		select ARM_L1_CACHE_SHIFT_6
			select ARCH_USES_GETTIMEOFFSET
	help		help
	Samsung S5PV210/S5PC110 series based systems		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-samsung/Kconfig"
	source "arch/arm/plat-s3c24xx/Kconfig"		source "arch/arm/plat-s3c24xx/Kconfig"
	source "arch/arm/plat-s5p/Kconfig"		source "arch/arm/plat-s5p/Kconfig"
	source "arch/arm/plat-s5pc1xx/Kconfig"
	source "arch/arm/plat-spear/Kconfig"		source "arch/arm/plat-spear/Kconfig"

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

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

	if ARCH_S5PC1XX
	source "arch/arm/mach-s5pc100/Kconfig"		source "arch/arm/mach-s5pc100/Kconfig"
	endif

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

arch/arm/Makefile

+1 −2

arch/arm/configs/s3c2410_defconfig

+321 −317

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/s3c6400_defconfig

+183 −39

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.33-rc4		# Linux kernel version: 2.6.34
	# Tue Jan 19 13:12:40 2010		# Sat May 22 03:17:32 2010
	#		#
	CONFIG_ARM=y		CONFIG_ARM=y
	CONFIG_SYS_SUPPORTS_APM_EMULATION=y		CONFIG_SYS_SUPPORTS_APM_EMULATION=y
	CONFIG_GENERIC_GPIO=y		CONFIG_GENERIC_GPIO=y
			CONFIG_HAVE_PROC_CPU=y
	CONFIG_NO_IOPORT=y		CONFIG_NO_IOPORT=y
	CONFIG_GENERIC_HARDIRQS=y		CONFIG_GENERIC_HARDIRQS=y
	CONFIG_STACKTRACE_SUPPORT=y		CONFIG_STACKTRACE_SUPPORT=y
	@@ -18,6 +19,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
	CONFIG_ARCH_HAS_CPUFREQ=y		CONFIG_ARCH_HAS_CPUFREQ=y
	CONFIG_GENERIC_HWEIGHT=y		CONFIG_GENERIC_HWEIGHT=y
	CONFIG_GENERIC_CALIBRATE_DELAY=y		CONFIG_GENERIC_CALIBRATE_DELAY=y
			CONFIG_NEED_DMA_MAP_STATE=y
	CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y		CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
	CONFIG_VECTORS_BASE=0xffff0000		CONFIG_VECTORS_BASE=0xffff0000
	CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
	@@ -53,7 +55,6 @@ CONFIG_RCU_FANOUT=32
	# CONFIG_TREE_RCU_TRACE is not set		# CONFIG_TREE_RCU_TRACE is not set
	# CONFIG_IKCONFIG is not set		# CONFIG_IKCONFIG is not set
	CONFIG_LOG_BUF_SHIFT=17		CONFIG_LOG_BUF_SHIFT=17
	# CONFIG_GROUP_SCHED is not set
	# CONFIG_CGROUPS is not set		# CONFIG_CGROUPS is not set
	CONFIG_SYSFS_DEPRECATED=y		CONFIG_SYSFS_DEPRECATED=y
	CONFIG_SYSFS_DEPRECATED_V2=y		CONFIG_SYSFS_DEPRECATED_V2=y
	@@ -89,10 +90,14 @@ CONFIG_TIMERFD=y
	CONFIG_EVENTFD=y		CONFIG_EVENTFD=y
	CONFIG_SHMEM=y		CONFIG_SHMEM=y
	CONFIG_AIO=y		CONFIG_AIO=y
			CONFIG_HAVE_PERF_EVENTS=y
			CONFIG_PERF_USE_VMALLOC=y

	#		#
	# Kernel Performance Events And Counters		# Kernel Performance Events And Counters
	#		#
			# CONFIG_PERF_EVENTS is not set
			# CONFIG_PERF_COUNTERS is not set
	CONFIG_VM_EVENT_COUNTERS=y		CONFIG_VM_EVENT_COUNTERS=y
	CONFIG_SLUB_DEBUG=y		CONFIG_SLUB_DEBUG=y
	CONFIG_COMPAT_BRK=y		CONFIG_COMPAT_BRK=y
	@@ -164,7 +169,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
	# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set		# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
	# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
	# CONFIG_MUTEX_SPIN_ON_OWNER is not set		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
	# CONFIG_FREEZER is not set		CONFIG_FREEZER=y

	#		#
	# System Type		# System Type
	@@ -175,6 +180,7 @@ CONFIG_MMU=y
	# CONFIG_ARCH_REALVIEW is not set		# CONFIG_ARCH_REALVIEW is not set
	# CONFIG_ARCH_VERSATILE is not set		# CONFIG_ARCH_VERSATILE is not set
	# CONFIG_ARCH_AT91 is not set		# CONFIG_ARCH_AT91 is not set
			# CONFIG_ARCH_BCMRING is not set
	# CONFIG_ARCH_CLPS711X is not set		# CONFIG_ARCH_CLPS711X is not set
	# CONFIG_ARCH_GEMINI is not set		# CONFIG_ARCH_GEMINI is not set
	# CONFIG_ARCH_EBSA110 is not set		# CONFIG_ARCH_EBSA110 is not set
	@@ -184,7 +190,6 @@ CONFIG_MMU=y
	# CONFIG_ARCH_STMP3XXX is not set		# CONFIG_ARCH_STMP3XXX is not set
	# CONFIG_ARCH_NETX is not set		# CONFIG_ARCH_NETX is not set
	# CONFIG_ARCH_H720X is not set		# CONFIG_ARCH_H720X is not set
	# CONFIG_ARCH_NOMADIK is not set
	# CONFIG_ARCH_IOP13XX is not set		# CONFIG_ARCH_IOP13XX is not set
	# CONFIG_ARCH_IOP32X is not set		# CONFIG_ARCH_IOP32X is not set
	# CONFIG_ARCH_IOP33X is not set		# CONFIG_ARCH_IOP33X is not set
	@@ -201,30 +206,44 @@ CONFIG_MMU=y
	# CONFIG_ARCH_KS8695 is not set		# CONFIG_ARCH_KS8695 is not set
	# CONFIG_ARCH_NS9XXX is not set		# CONFIG_ARCH_NS9XXX is not set
	# CONFIG_ARCH_W90X900 is not set		# CONFIG_ARCH_W90X900 is not set
			# CONFIG_ARCH_NUC93X is not set
	# CONFIG_ARCH_PNX4008 is not set		# CONFIG_ARCH_PNX4008 is not set
	# CONFIG_ARCH_PXA is not set		# CONFIG_ARCH_PXA is not set
	# CONFIG_ARCH_MSM is not set		# CONFIG_ARCH_MSM is not set
			# CONFIG_ARCH_SHMOBILE is not set
	# CONFIG_ARCH_RPC is not set		# CONFIG_ARCH_RPC is not set
	# CONFIG_ARCH_SA1100 is not set		# CONFIG_ARCH_SA1100 is not set
	# CONFIG_ARCH_S3C2410 is not set		# CONFIG_ARCH_S3C2410 is not set
	CONFIG_ARCH_S3C64XX=y		CONFIG_ARCH_S3C64XX=y
	# CONFIG_ARCH_S5P6440 is not set		# CONFIG_ARCH_S5P6440 is not set
			# CONFIG_ARCH_S5P6442 is not set
	# CONFIG_ARCH_S5PC1XX is not set		# CONFIG_ARCH_S5PC1XX is not set
			# CONFIG_ARCH_S5PV210 is not set
	# CONFIG_ARCH_SHARK is not set		# CONFIG_ARCH_SHARK is not set
	# CONFIG_ARCH_LH7A40X is not set		# CONFIG_ARCH_LH7A40X is not set
	# CONFIG_ARCH_U300 is not set		# CONFIG_ARCH_U300 is not set
			# CONFIG_ARCH_U8500 is not set
			# CONFIG_ARCH_NOMADIK is not set
	# CONFIG_ARCH_DAVINCI is not set		# CONFIG_ARCH_DAVINCI is not set
	# CONFIG_ARCH_OMAP is not set		# CONFIG_ARCH_OMAP is not set
	# CONFIG_ARCH_BCMRING is not set
	# CONFIG_ARCH_U8500 is not set
	CONFIG_PLAT_SAMSUNG=y		CONFIG_PLAT_SAMSUNG=y

			#
			# Boot options
			#
			CONFIG_S3C_BOOT_ERROR_RESET=y
			CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
			CONFIG_S3C_LOWLEVEL_UART_PORT=0
	CONFIG_SAMSUNG_CLKSRC=y		CONFIG_SAMSUNG_CLKSRC=y
	CONFIG_SAMSUNG_IRQ_VIC_TIMER=y		CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
	CONFIG_SAMSUNG_IRQ_UART=y		CONFIG_SAMSUNG_IRQ_UART=y
			CONFIG_SAMSUNG_GPIOLIB_4BIT=y
	CONFIG_S3C_GPIO_CFG_S3C24XX=y		CONFIG_S3C_GPIO_CFG_S3C24XX=y
	CONFIG_S3C_GPIO_CFG_S3C64XX=y		CONFIG_S3C_GPIO_CFG_S3C64XX=y
	CONFIG_S3C_GPIO_PULL_UPDOWN=y		CONFIG_S3C_GPIO_PULL_UPDOWN=y
	CONFIG_SAMSUNG_GPIO_EXTRA=0		CONFIG_SAMSUNG_GPIO_EXTRA=0
			CONFIG_S3C_GPIO_SPACE=0
			CONFIG_S3C_GPIO_TRACK=y
	# CONFIG_S3C_ADC is not set		# CONFIG_S3C_ADC is not set
	CONFIG_S3C_DEV_HSMMC=y		CONFIG_S3C_DEV_HSMMC=y
	CONFIG_S3C_DEV_HSMMC1=y		CONFIG_S3C_DEV_HSMMC1=y
	@@ -233,36 +252,29 @@ CONFIG_S3C_DEV_FB=y
	CONFIG_S3C_DEV_USB_HOST=y		CONFIG_S3C_DEV_USB_HOST=y
	CONFIG_S3C_DEV_USB_HSOTG=y		CONFIG_S3C_DEV_USB_HSOTG=y
	CONFIG_S3C_DEV_NAND=y		CONFIG_S3C_DEV_NAND=y
			CONFIG_S3C_DMA=y

			#
			# Power management
			#
			# CONFIG_SAMSUNG_PM_DEBUG is not set
			# CONFIG_S3C_PM_DEBUG_LED_SMDK is not set
			# CONFIG_SAMSUNG_PM_CHECK is not set
	CONFIG_PLAT_S3C64XX=y		CONFIG_PLAT_S3C64XX=y
	CONFIG_CPU_S3C6400_INIT=y		CONFIG_CPU_S3C6410=y
	CONFIG_CPU_S3C6400_CLOCK=y		CONFIG_S3C64XX_DMA=y
	# CONFIG_S3C64XX_DMA is not set		CONFIG_S3C64XX_SETUP_SDHCI=y
	CONFIG_S3C64XX_SETUP_I2C0=y		CONFIG_S3C64XX_SETUP_I2C0=y
	CONFIG_S3C64XX_SETUP_I2C1=y		CONFIG_S3C64XX_SETUP_I2C1=y
	CONFIG_S3C64XX_SETUP_FB_24BPP=y		CONFIG_S3C64XX_SETUP_FB_24BPP=y
	CONFIG_S3C64XX_SETUP_SDHCI_GPIO=y		CONFIG_S3C64XX_SETUP_SDHCI_GPIO=y
	CONFIG_PLAT_S3C=y

	#
	# Boot options
	#
	CONFIG_S3C_BOOT_ERROR_RESET=y
	CONFIG_S3C_BOOT_UART_FORCE_FIFO=y

	#
	# Power management
	#
	CONFIG_S3C_LOWLEVEL_UART_PORT=0
	CONFIG_S3C_GPIO_SPACE=0
	CONFIG_S3C_GPIO_TRACK=y
	# CONFIG_MACH_SMDK6400 is not set		# CONFIG_MACH_SMDK6400 is not set
	CONFIG_CPU_S3C6410=y
	CONFIG_S3C6410_SETUP_SDHCI=y
	# CONFIG_MACH_ANW6410 is not set		# CONFIG_MACH_ANW6410 is not set
	CONFIG_MACH_SMDK6410=y		CONFIG_MACH_SMDK6410=y
	CONFIG_SMDK6410_SD_CH0=y		CONFIG_SMDK6410_SD_CH0=y
	# CONFIG_SMDK6410_SD_CH1 is not set		# CONFIG_SMDK6410_SD_CH1 is not set
	# CONFIG_SMDK6410_WM1190_EV1 is not set		# CONFIG_SMDK6410_WM1190_EV1 is not set
			# CONFIG_SMDK6410_WM1192_EV1 is not set
	# CONFIG_MACH_NCP is not set		# CONFIG_MACH_NCP is not set
	# CONFIG_MACH_HMT is not set		# CONFIG_MACH_HMT is not set

	@@ -290,6 +302,7 @@ CONFIG_ARM_THUMB=y
	# CONFIG_CPU_DCACHE_DISABLE is not set		# CONFIG_CPU_DCACHE_DISABLE is not set
	# CONFIG_CPU_BPREDICT_DISABLE is not set		# CONFIG_CPU_BPREDICT_DISABLE is not set
	CONFIG_ARM_L1_CACHE_SHIFT=5		CONFIG_ARM_L1_CACHE_SHIFT=5
			CONFIG_CPU_HAS_PMU=y
	# CONFIG_ARM_ERRATA_411920 is not set		# CONFIG_ARM_ERRATA_411920 is not set
	CONFIG_ARM_VIC=y		CONFIG_ARM_VIC=y
	CONFIG_ARM_VIC_NR=2		CONFIG_ARM_VIC_NR=2
	@@ -371,7 +384,14 @@ CONFIG_HAVE_AOUT=y
	#		#
	# Power management options		# Power management options
	#		#
	# CONFIG_PM is not set		CONFIG_PM=y
			# CONFIG_PM_DEBUG is not set
			CONFIG_PM_SLEEP=y
			CONFIG_SUSPEND=y
			CONFIG_SUSPEND_FREEZER=y
			# CONFIG_APM_EMULATION is not set
			# CONFIG_PM_RUNTIME is not set
			CONFIG_PM_OPS=y
	CONFIG_ARCH_SUSPEND_POSSIBLE=y		CONFIG_ARCH_SUSPEND_POSSIBLE=y
	# CONFIG_NET is not set		# CONFIG_NET is not set

	@@ -392,7 +412,88 @@ CONFIG_EXTRA_FIRMWARE=""
	# CONFIG_DEBUG_DRIVER is not set		# CONFIG_DEBUG_DRIVER is not set
	# CONFIG_DEBUG_DEVRES is not set		# CONFIG_DEBUG_DEVRES is not set
	# CONFIG_SYS_HYPERVISOR is not set		# CONFIG_SYS_HYPERVISOR is not set
	# CONFIG_MTD is not set		CONFIG_MTD=y
			# CONFIG_MTD_DEBUG is not set
			# CONFIG_MTD_TESTS is not set
			# CONFIG_MTD_CONCAT is not set
			# CONFIG_MTD_PARTITIONS is not set

			#
			# User Modules And Translation Layers
			#
			# CONFIG_MTD_CHAR is not set
			# CONFIG_MTD_BLKDEVS is not set
			# CONFIG_MTD_BLOCK is not set
			# CONFIG_MTD_BLOCK_RO is not set
			# CONFIG_FTL is not set
			# CONFIG_NFTL is not set
			# CONFIG_INFTL is not set
			# CONFIG_RFD_FTL is not set
			# CONFIG_SSFDC is not set
			# CONFIG_MTD_OOPS is not set

			#
			# RAM/ROM/Flash chip drivers
			#
			# CONFIG_MTD_CFI is not set
			# CONFIG_MTD_JEDECPROBE is not set
			CONFIG_MTD_MAP_BANK_WIDTH_1=y
			CONFIG_MTD_MAP_BANK_WIDTH_2=y
			CONFIG_MTD_MAP_BANK_WIDTH_4=y
			# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
			# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
			# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
			CONFIG_MTD_CFI_I1=y
			CONFIG_MTD_CFI_I2=y
			# CONFIG_MTD_CFI_I4 is not set
			# CONFIG_MTD_CFI_I8 is not set
			# CONFIG_MTD_RAM is not set
			# CONFIG_MTD_ROM is not set
			# CONFIG_MTD_ABSENT is not set

			#
			# Mapping drivers for chip access
			#
			# CONFIG_MTD_COMPLEX_MAPPINGS is not set
			# CONFIG_MTD_PLATRAM is not set

			#
			# Self-contained MTD device drivers
			#
			# CONFIG_MTD_SLRAM is not set
			# CONFIG_MTD_PHRAM is not set
			# CONFIG_MTD_MTDRAM is not set
			# CONFIG_MTD_BLOCK2MTD is not set

			#
			# Disk-On-Chip Device Drivers
			#
			# CONFIG_MTD_DOC2000 is not set
			# CONFIG_MTD_DOC2001 is not set
			# CONFIG_MTD_DOC2001PLUS is not set
			CONFIG_MTD_NAND=y
			# CONFIG_MTD_NAND_VERIFY_WRITE is not set
			# CONFIG_MTD_NAND_ECC_SMC is not set
			# CONFIG_MTD_NAND_MUSEUM_IDS is not set
			# CONFIG_MTD_NAND_GPIO is not set
			CONFIG_MTD_NAND_IDS=y
			CONFIG_MTD_NAND_S3C2410=y
			# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
			# CONFIG_MTD_NAND_S3C2410_HWECC is not set
			# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
			# CONFIG_MTD_NAND_DISKONCHIP is not set
			# CONFIG_MTD_NAND_PLATFORM is not set
			# CONFIG_MTD_ONENAND is not set

			#
			# LPDDR flash memory drivers
			#
			# CONFIG_MTD_LPDDR is not set

			#
			# UBI - Unsorted block images
			#
			# CONFIG_MTD_UBI is not set
	# CONFIG_PARPORT is not set		# CONFIG_PARPORT is not set
	CONFIG_BLK_DEV=y		CONFIG_BLK_DEV=y
	# CONFIG_BLK_DEV_COW_COMMON is not set		# CONFIG_BLK_DEV_COW_COMMON is not set
	@@ -413,6 +514,7 @@ CONFIG_MISC_DEVICES=y
	# CONFIG_ICS932S401 is not set		# CONFIG_ICS932S401 is not set
	# CONFIG_ENCLOSURE_SERVICES is not set		# CONFIG_ENCLOSURE_SERVICES is not set
	# CONFIG_ISL29003 is not set		# CONFIG_ISL29003 is not set
			# CONFIG_SENSORS_TSL2550 is not set
	# CONFIG_DS1682 is not set		# CONFIG_DS1682 is not set
	# CONFIG_C2PORT is not set		# CONFIG_C2PORT is not set

	@@ -430,6 +532,7 @@ CONFIG_HAVE_IDE=y
	#		#
	# SCSI device support		# SCSI device support
	#		#
			CONFIG_SCSI_MOD=y
	# CONFIG_RAID_ATTRS is not set		# CONFIG_RAID_ATTRS is not set
	# CONFIG_SCSI is not set		# CONFIG_SCSI is not set
	# CONFIG_SCSI_DMA is not set		# CONFIG_SCSI_DMA is not set
	@@ -527,12 +630,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
	# Non-8250 serial port support		# Non-8250 serial port support
	#		#
	CONFIG_SERIAL_SAMSUNG=y		CONFIG_SERIAL_SAMSUNG=y
			CONFIG_SERIAL_SAMSUNG_UARTS_4=y
	CONFIG_SERIAL_SAMSUNG_UARTS=4		CONFIG_SERIAL_SAMSUNG_UARTS=4
	# CONFIG_SERIAL_SAMSUNG_DEBUG is not set		# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
	CONFIG_SERIAL_SAMSUNG_CONSOLE=y		CONFIG_SERIAL_SAMSUNG_CONSOLE=y
	CONFIG_SERIAL_S3C6400=y		CONFIG_SERIAL_S3C6400=y
	CONFIG_SERIAL_CORE=y		CONFIG_SERIAL_CORE=y
	CONFIG_SERIAL_CORE_CONSOLE=y		CONFIG_SERIAL_CORE_CONSOLE=y
			# CONFIG_SERIAL_TIMBERDALE is not set
	CONFIG_UNIX98_PTYS=y		CONFIG_UNIX98_PTYS=y
	# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
	CONFIG_LEGACY_PTYS=y		CONFIG_LEGACY_PTYS=y
	@@ -561,6 +666,7 @@ CONFIG_I2C_HELPER_AUTO=y
	# CONFIG_I2C_OCORES is not set		# CONFIG_I2C_OCORES is not set
	CONFIG_I2C_S3C2410=y		CONFIG_I2C_S3C2410=y
	# CONFIG_I2C_SIMTEC is not set		# CONFIG_I2C_SIMTEC is not set
			# CONFIG_I2C_XILINX is not set

	#		#
	# External I2C/SMBus adapter drivers		# External I2C/SMBus adapter drivers
	@@ -573,15 +679,9 @@ CONFIG_I2C_S3C2410=y
	#		#
	# CONFIG_I2C_PCA_PLATFORM is not set		# CONFIG_I2C_PCA_PLATFORM is not set
	# CONFIG_I2C_STUB is not set		# CONFIG_I2C_STUB is not set

	#
	# Miscellaneous I2C Chip support
	#
	# CONFIG_SENSORS_TSL2550 is not set
	# CONFIG_I2C_DEBUG_CORE is not set		# CONFIG_I2C_DEBUG_CORE is not set
	# CONFIG_I2C_DEBUG_ALGO is not set		# CONFIG_I2C_DEBUG_ALGO is not set
	# CONFIG_I2C_DEBUG_BUS is not set		# CONFIG_I2C_DEBUG_BUS is not set
	# CONFIG_I2C_DEBUG_CHIP is not set
	# CONFIG_SPI is not set		# CONFIG_SPI is not set

	#		#
	@@ -596,10 +696,12 @@ CONFIG_GPIOLIB=y
	#		#
	# Memory mapped GPIO expanders:		# Memory mapped GPIO expanders:
	#		#
			# CONFIG_GPIO_IT8761E is not set

	#		#
	# I2C GPIO expanders:		# I2C GPIO expanders:
	#		#
			# CONFIG_GPIO_MAX7300 is not set
	# CONFIG_GPIO_MAX732X is not set		# CONFIG_GPIO_MAX732X is not set
	# CONFIG_GPIO_PCA953X is not set		# CONFIG_GPIO_PCA953X is not set
	# CONFIG_GPIO_PCF857X is not set		# CONFIG_GPIO_PCF857X is not set
	@@ -633,10 +735,11 @@ CONFIG_HWMON=y
	# CONFIG_SENSORS_ADM1029 is not set		# CONFIG_SENSORS_ADM1029 is not set
	# CONFIG_SENSORS_ADM1031 is not set		# CONFIG_SENSORS_ADM1031 is not set
	# CONFIG_SENSORS_ADM9240 is not set		# CONFIG_SENSORS_ADM9240 is not set
			# CONFIG_SENSORS_ADT7411 is not set
	# CONFIG_SENSORS_ADT7462 is not set		# CONFIG_SENSORS_ADT7462 is not set
	# CONFIG_SENSORS_ADT7470 is not set		# CONFIG_SENSORS_ADT7470 is not set
	# CONFIG_SENSORS_ADT7473 is not set
	# CONFIG_SENSORS_ADT7475 is not set		# CONFIG_SENSORS_ADT7475 is not set
			# CONFIG_SENSORS_ASC7621 is not set
	# CONFIG_SENSORS_ATXP1 is not set		# CONFIG_SENSORS_ATXP1 is not set
	# CONFIG_SENSORS_DS1621 is not set		# CONFIG_SENSORS_DS1621 is not set
	# CONFIG_SENSORS_F71805F is not set		# CONFIG_SENSORS_F71805F is not set
	@@ -699,10 +802,13 @@ CONFIG_SSB_POSSIBLE=y
	# Multifunction device drivers		# Multifunction device drivers
	#		#
	# CONFIG_MFD_CORE is not set		# CONFIG_MFD_CORE is not set
			# CONFIG_MFD_88PM860X is not set
	# CONFIG_MFD_SM501 is not set		# CONFIG_MFD_SM501 is not set
	# CONFIG_MFD_ASIC3 is not set		# CONFIG_MFD_ASIC3 is not set
	# CONFIG_HTC_EGPIO is not set		# CONFIG_HTC_EGPIO is not set
	# CONFIG_HTC_PASIC3 is not set		# CONFIG_HTC_PASIC3 is not set
			# CONFIG_HTC_I2CPLD is not set
			# CONFIG_UCB1400_CORE is not set
	# CONFIG_TPS65010 is not set		# CONFIG_TPS65010 is not set
	# CONFIG_TWL4030_CORE is not set		# CONFIG_TWL4030_CORE is not set
	# CONFIG_MFD_TMIO is not set		# CONFIG_MFD_TMIO is not set
	@@ -711,12 +817,13 @@ CONFIG_SSB_POSSIBLE=y
	# CONFIG_MFD_TC6393XB is not set		# CONFIG_MFD_TC6393XB is not set
	# CONFIG_PMIC_DA903X is not set		# CONFIG_PMIC_DA903X is not set
	# CONFIG_PMIC_ADP5520 is not set		# CONFIG_PMIC_ADP5520 is not set
			# CONFIG_MFD_MAX8925 is not set
	# CONFIG_MFD_WM8400 is not set		# CONFIG_MFD_WM8400 is not set
	# CONFIG_MFD_WM831X is not set		# CONFIG_MFD_WM831X is not set
	# CONFIG_MFD_WM8350_I2C is not set		# CONFIG_MFD_WM8350_I2C is not set
			# CONFIG_MFD_WM8994 is not set
	# CONFIG_MFD_PCF50633 is not set		# CONFIG_MFD_PCF50633 is not set
	# CONFIG_AB3100_CORE is not set		# CONFIG_AB3100_CORE is not set
	# CONFIG_MFD_88PM8607 is not set
	# CONFIG_REGULATOR is not set		# CONFIG_REGULATOR is not set
	# CONFIG_MEDIA_SUPPORT is not set		# CONFIG_MEDIA_SUPPORT is not set

	@@ -738,7 +845,44 @@ CONFIG_SSB_POSSIBLE=y
	#		#
	# CONFIG_VGA_CONSOLE is not set		# CONFIG_VGA_CONSOLE is not set
	CONFIG_DUMMY_CONSOLE=y		CONFIG_DUMMY_CONSOLE=y
	# CONFIG_SOUND is not set		CONFIG_SOUND=y
			CONFIG_SOUND_OSS_CORE=y
			CONFIG_SOUND_OSS_CORE_PRECLAIM=y
			CONFIG_SND=m
			CONFIG_SND_TIMER=m
			CONFIG_SND_PCM=m
			CONFIG_SND_JACK=y
			# CONFIG_SND_SEQUENCER is not set
			CONFIG_SND_OSSEMUL=y
			CONFIG_SND_MIXER_OSS=m
			CONFIG_SND_PCM_OSS=m
			CONFIG_SND_PCM_OSS_PLUGINS=y
			# CONFIG_SND_DYNAMIC_MINORS is not set
			CONFIG_SND_SUPPORT_OLD_API=y
			CONFIG_SND_VERBOSE_PROCFS=y
			# CONFIG_SND_VERBOSE_PRINTK is not set
			# CONFIG_SND_DEBUG is not set
			# CONFIG_SND_RAWMIDI_SEQ is not set
			# CONFIG_SND_OPL3_LIB_SEQ is not set
			# CONFIG_SND_OPL4_LIB_SEQ is not set
			# CONFIG_SND_SBAWE_SEQ is not set
			# CONFIG_SND_EMU10K1_SEQ is not set
			CONFIG_SND_DRIVERS=y
			# CONFIG_SND_DUMMY is not set
			# CONFIG_SND_MTPAV is not set
			# CONFIG_SND_SERIAL_U16550 is not set
			# CONFIG_SND_MPU401 is not set
			CONFIG_SND_ARM=y
			CONFIG_SND_SOC=m
			CONFIG_SND_SOC_AC97_BUS=y
			CONFIG_SND_S3C24XX_SOC=m
			CONFIG_SND_S3C_SOC_AC97=m
			CONFIG_SND_SOC_SMDK_WM9713=m
			CONFIG_SND_SOC_I2C_AND_SPI=m
			# CONFIG_SND_SOC_ALL_CODECS is not set
			CONFIG_SND_SOC_WM9713=m
			# CONFIG_SOUND_PRIME is not set
			CONFIG_AC97_BUS=m
	CONFIG_HID_SUPPORT=y		CONFIG_HID_SUPPORT=y
	CONFIG_HID=y		CONFIG_HID=y
	# CONFIG_HIDRAW is not set		# CONFIG_HIDRAW is not set
	@@ -784,8 +928,6 @@ CONFIG_MMC_SDHCI=y
	# CONFIG_MMC_SDHCI_PLTFM is not set		# CONFIG_MMC_SDHCI_PLTFM is not set
	CONFIG_MMC_SDHCI_S3C=y		CONFIG_MMC_SDHCI_S3C=y
	# CONFIG_MMC_SDHCI_S3C_DMA is not set		# CONFIG_MMC_SDHCI_S3C_DMA is not set
	# CONFIG_MMC_AT91 is not set
	# CONFIG_MMC_ATMELMCI is not set
	# CONFIG_MEMSTICK is not set		# CONFIG_MEMSTICK is not set
	# CONFIG_NEW_LEDS is not set		# CONFIG_NEW_LEDS is not set
	# CONFIG_ACCESSIBILITY is not set		# CONFIG_ACCESSIBILITY is not set
	@@ -869,6 +1011,8 @@ CONFIG_MISC_FILESYSTEMS=y
	# CONFIG_BEFS_FS is not set		# CONFIG_BEFS_FS is not set
	# CONFIG_BFS_FS is not set		# CONFIG_BFS_FS is not set
	# CONFIG_EFS_FS is not set		# CONFIG_EFS_FS is not set
			# CONFIG_JFFS2_FS is not set
			# CONFIG_LOGFS is not set
	CONFIG_CRAMFS=y		CONFIG_CRAMFS=y
	# CONFIG_SQUASHFS is not set		# CONFIG_SQUASHFS is not set
	# CONFIG_VXFS_FS is not set		# CONFIG_VXFS_FS is not set

arch/arm/configs/s5p6440_defconfig

+43 −17

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.33-rc2		# Linux kernel version: 2.6.34
	# Sat Jan 9 16:33:55 2010		# Sat May 22 03:18:18 2010
	#		#
	CONFIG_ARM=y		CONFIG_ARM=y
	CONFIG_SYS_SUPPORTS_APM_EMULATION=y		CONFIG_SYS_SUPPORTS_APM_EMULATION=y
	CONFIG_GENERIC_GPIO=y		CONFIG_GENERIC_GPIO=y
			CONFIG_HAVE_PROC_CPU=y
	CONFIG_NO_IOPORT=y		CONFIG_NO_IOPORT=y
	CONFIG_GENERIC_HARDIRQS=y		CONFIG_GENERIC_HARDIRQS=y
	CONFIG_STACKTRACE_SUPPORT=y		CONFIG_STACKTRACE_SUPPORT=y
	@@ -17,6 +18,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
	CONFIG_RWSEM_GENERIC_SPINLOCK=y		CONFIG_RWSEM_GENERIC_SPINLOCK=y
	CONFIG_GENERIC_HWEIGHT=y		CONFIG_GENERIC_HWEIGHT=y
	CONFIG_GENERIC_CALIBRATE_DELAY=y		CONFIG_GENERIC_CALIBRATE_DELAY=y
			CONFIG_NEED_DMA_MAP_STATE=y
	CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y		CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
	CONFIG_VECTORS_BASE=0xffff0000		CONFIG_VECTORS_BASE=0xffff0000
	CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
	@@ -30,6 +32,12 @@ CONFIG_BROKEN_ON_SMP=y
	CONFIG_INIT_ENV_ARG_LIMIT=32		CONFIG_INIT_ENV_ARG_LIMIT=32
	CONFIG_LOCALVERSION=""		CONFIG_LOCALVERSION=""
	CONFIG_LOCALVERSION_AUTO=y		CONFIG_LOCALVERSION_AUTO=y
			CONFIG_HAVE_KERNEL_GZIP=y
			CONFIG_HAVE_KERNEL_LZO=y
			CONFIG_KERNEL_GZIP=y
			# CONFIG_KERNEL_BZIP2 is not set
			# CONFIG_KERNEL_LZMA is not set
			# CONFIG_KERNEL_LZO is not set
	CONFIG_SWAP=y		CONFIG_SWAP=y
	# CONFIG_SYSVIPC is not set		# CONFIG_SYSVIPC is not set
	# CONFIG_BSD_PROCESS_ACCT is not set		# CONFIG_BSD_PROCESS_ACCT is not set
	@@ -46,7 +54,6 @@ CONFIG_RCU_FANOUT=32
	# CONFIG_TREE_RCU_TRACE is not set		# CONFIG_TREE_RCU_TRACE is not set
	# CONFIG_IKCONFIG is not set		# CONFIG_IKCONFIG is not set
	CONFIG_LOG_BUF_SHIFT=17		CONFIG_LOG_BUF_SHIFT=17
	# CONFIG_GROUP_SCHED is not set
	# CONFIG_CGROUPS is not set		# CONFIG_CGROUPS is not set
	CONFIG_SYSFS_DEPRECATED=y		CONFIG_SYSFS_DEPRECATED=y
	CONFIG_SYSFS_DEPRECATED_V2=y		CONFIG_SYSFS_DEPRECATED_V2=y
	@@ -60,6 +67,7 @@ CONFIG_INITRAMFS_SOURCE=""
	CONFIG_RD_GZIP=y		CONFIG_RD_GZIP=y
	CONFIG_RD_BZIP2=y		CONFIG_RD_BZIP2=y
	CONFIG_RD_LZMA=y		CONFIG_RD_LZMA=y
			CONFIG_RD_LZO=y
	CONFIG_CC_OPTIMIZE_FOR_SIZE=y		CONFIG_CC_OPTIMIZE_FOR_SIZE=y
	CONFIG_SYSCTL=y		CONFIG_SYSCTL=y
	CONFIG_ANON_INODES=y		CONFIG_ANON_INODES=y
	@@ -81,10 +89,14 @@ CONFIG_TIMERFD=y
	CONFIG_EVENTFD=y		CONFIG_EVENTFD=y
	CONFIG_SHMEM=y		CONFIG_SHMEM=y
	CONFIG_AIO=y		CONFIG_AIO=y
			CONFIG_HAVE_PERF_EVENTS=y
			CONFIG_PERF_USE_VMALLOC=y

	#		#
	# Kernel Performance Events And Counters		# Kernel Performance Events And Counters
	#		#
			# CONFIG_PERF_EVENTS is not set
			# CONFIG_PERF_COUNTERS is not set
	CONFIG_VM_EVENT_COUNTERS=y		CONFIG_VM_EVENT_COUNTERS=y
	CONFIG_SLUB_DEBUG=y		CONFIG_SLUB_DEBUG=y
	CONFIG_COMPAT_BRK=y		CONFIG_COMPAT_BRK=y
	@@ -167,6 +179,7 @@ CONFIG_MMU=y
	# CONFIG_ARCH_REALVIEW is not set		# CONFIG_ARCH_REALVIEW is not set
	# CONFIG_ARCH_VERSATILE is not set		# CONFIG_ARCH_VERSATILE is not set
	# CONFIG_ARCH_AT91 is not set		# CONFIG_ARCH_AT91 is not set
			# CONFIG_ARCH_BCMRING is not set
	# CONFIG_ARCH_CLPS711X is not set		# CONFIG_ARCH_CLPS711X is not set
	# CONFIG_ARCH_GEMINI is not set		# CONFIG_ARCH_GEMINI is not set
	# CONFIG_ARCH_EBSA110 is not set		# CONFIG_ARCH_EBSA110 is not set
	@@ -176,7 +189,6 @@ CONFIG_MMU=y
	# CONFIG_ARCH_STMP3XXX is not set		# CONFIG_ARCH_STMP3XXX is not set
	# CONFIG_ARCH_NETX is not set		# CONFIG_ARCH_NETX is not set
	# CONFIG_ARCH_H720X is not set		# CONFIG_ARCH_H720X is not set
	# CONFIG_ARCH_NOMADIK is not set
	# CONFIG_ARCH_IOP13XX is not set		# CONFIG_ARCH_IOP13XX is not set
	# CONFIG_ARCH_IOP32X is not set		# CONFIG_ARCH_IOP32X is not set
	# CONFIG_ARCH_IOP33X is not set		# CONFIG_ARCH_IOP33X is not set
	@@ -193,44 +205,50 @@ CONFIG_MMU=y
	# CONFIG_ARCH_KS8695 is not set		# CONFIG_ARCH_KS8695 is not set
	# CONFIG_ARCH_NS9XXX is not set		# CONFIG_ARCH_NS9XXX is not set
	# CONFIG_ARCH_W90X900 is not set		# CONFIG_ARCH_W90X900 is not set
			# CONFIG_ARCH_NUC93X is not set
	# CONFIG_ARCH_PNX4008 is not set		# CONFIG_ARCH_PNX4008 is not set
	# CONFIG_ARCH_PXA is not set		# CONFIG_ARCH_PXA is not set
	# CONFIG_ARCH_MSM is not set		# CONFIG_ARCH_MSM is not set
			# CONFIG_ARCH_SHMOBILE is not set
	# CONFIG_ARCH_RPC is not set		# CONFIG_ARCH_RPC is not set
	# CONFIG_ARCH_SA1100 is not set		# CONFIG_ARCH_SA1100 is not set
	# CONFIG_ARCH_S3C2410 is not set		# CONFIG_ARCH_S3C2410 is not set
	# CONFIG_ARCH_S3C64XX is not set		# CONFIG_ARCH_S3C64XX is not set
	CONFIG_ARCH_S5P6440=y		CONFIG_ARCH_S5P6440=y
			# CONFIG_ARCH_S5P6442 is not set
	# CONFIG_ARCH_S5PC1XX is not set		# CONFIG_ARCH_S5PC1XX is not set
			# CONFIG_ARCH_S5PV210 is not set
	# CONFIG_ARCH_SHARK is not set		# CONFIG_ARCH_SHARK is not set
	# CONFIG_ARCH_LH7A40X is not set		# CONFIG_ARCH_LH7A40X is not set
	# CONFIG_ARCH_U300 is not set		# CONFIG_ARCH_U300 is not set
			# CONFIG_ARCH_U8500 is not set
			# CONFIG_ARCH_NOMADIK is not set
	# CONFIG_ARCH_DAVINCI is not set		# CONFIG_ARCH_DAVINCI is not set
	# CONFIG_ARCH_OMAP is not set		# CONFIG_ARCH_OMAP is not set
	# CONFIG_ARCH_BCMRING is not set
	# CONFIG_ARCH_U8500 is not set
	CONFIG_PLAT_SAMSUNG=y		CONFIG_PLAT_SAMSUNG=y
	CONFIG_SAMSUNG_CLKSRC=y
	CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
	CONFIG_SAMSUNG_IRQ_UART=y
	CONFIG_SAMSUNG_GPIO_EXTRA=0
	CONFIG_PLAT_S3C=y

	#		#
	# Boot options		# Boot options
	#		#
	CONFIG_S3C_BOOT_ERROR_RESET=y		CONFIG_S3C_BOOT_ERROR_RESET=y
	CONFIG_S3C_BOOT_UART_FORCE_FIFO=y		CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
			CONFIG_S3C_LOWLEVEL_UART_PORT=1
			CONFIG_SAMSUNG_CLKSRC=y
			CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
			CONFIG_SAMSUNG_IRQ_UART=y
			CONFIG_SAMSUNG_GPIOLIB_4BIT=y
			CONFIG_S3C_GPIO_CFG_S3C24XX=y
			CONFIG_S3C_GPIO_CFG_S3C64XX=y
			CONFIG_S3C_GPIO_PULL_UPDOWN=y
			CONFIG_SAMSUNG_GPIO_EXTRA=0
			CONFIG_S3C_GPIO_SPACE=0
			CONFIG_S3C_GPIO_TRACK=y
			# CONFIG_S3C_ADC is not set

	#		#
	# Power management		# Power management
	#		#
	CONFIG_S3C_LOWLEVEL_UART_PORT=1
	CONFIG_S3C_GPIO_SPACE=0
	CONFIG_S3C_GPIO_TRACK=y
	CONFIG_PLAT_S5P=y		CONFIG_PLAT_S5P=y
	CONFIG_CPU_S5P6440_INIT=y
	CONFIG_CPU_S5P6440_CLOCK=y
	CONFIG_CPU_S5P6440=y		CONFIG_CPU_S5P6440=y
	CONFIG_MACH_SMDK6440=y		CONFIG_MACH_SMDK6440=y

	@@ -258,6 +276,7 @@ CONFIG_ARM_THUMB=y
	# CONFIG_CPU_DCACHE_DISABLE is not set		# CONFIG_CPU_DCACHE_DISABLE is not set
	# CONFIG_CPU_BPREDICT_DISABLE is not set		# CONFIG_CPU_BPREDICT_DISABLE is not set
	CONFIG_ARM_L1_CACHE_SHIFT=5		CONFIG_ARM_L1_CACHE_SHIFT=5
			CONFIG_CPU_HAS_PMU=y
	# CONFIG_ARM_ERRATA_411920 is not set		# CONFIG_ARM_ERRATA_411920 is not set
	CONFIG_ARM_VIC=y		CONFIG_ARM_VIC=y
	CONFIG_ARM_VIC_NR=2		CONFIG_ARM_VIC_NR=2
	@@ -382,6 +401,7 @@ CONFIG_HAVE_IDE=y
	#		#
	# SCSI device support		# SCSI device support
	#		#
			CONFIG_SCSI_MOD=y
	# CONFIG_RAID_ATTRS is not set		# CONFIG_RAID_ATTRS is not set
	CONFIG_SCSI=y		CONFIG_SCSI=y
	CONFIG_SCSI_DMA=y		CONFIG_SCSI_DMA=y
	@@ -518,12 +538,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=3
	# Non-8250 serial port support		# Non-8250 serial port support
	#		#
	CONFIG_SERIAL_SAMSUNG=y		CONFIG_SERIAL_SAMSUNG=y
			CONFIG_SERIAL_SAMSUNG_UARTS_4=y
	CONFIG_SERIAL_SAMSUNG_UARTS=4		CONFIG_SERIAL_SAMSUNG_UARTS=4
	# CONFIG_SERIAL_SAMSUNG_DEBUG is not set		# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
	CONFIG_SERIAL_SAMSUNG_CONSOLE=y		CONFIG_SERIAL_SAMSUNG_CONSOLE=y
	CONFIG_SERIAL_S5P6440=y		CONFIG_SERIAL_S3C6400=y
	CONFIG_SERIAL_CORE=y		CONFIG_SERIAL_CORE=y
	CONFIG_SERIAL_CORE_CONSOLE=y		CONFIG_SERIAL_CORE_CONSOLE=y
			# CONFIG_SERIAL_TIMBERDALE is not set
	CONFIG_UNIX98_PTYS=y		CONFIG_UNIX98_PTYS=y
	# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
	CONFIG_LEGACY_PTYS=y		CONFIG_LEGACY_PTYS=y
	@@ -549,6 +571,7 @@ CONFIG_GPIOLIB=y
	#		#
	# Memory mapped GPIO expanders:		# Memory mapped GPIO expanders:
	#		#
			# CONFIG_GPIO_IT8761E is not set

	#		#
	# I2C GPIO expanders:		# I2C GPIO expanders:
	@@ -704,6 +727,7 @@ CONFIG_MISC_FILESYSTEMS=y
	# CONFIG_BEFS_FS is not set		# CONFIG_BEFS_FS is not set
	# CONFIG_BFS_FS is not set		# CONFIG_BFS_FS is not set
	# CONFIG_EFS_FS is not set		# CONFIG_EFS_FS is not set
			# CONFIG_LOGFS is not set
	CONFIG_CRAMFS=y		CONFIG_CRAMFS=y
	# CONFIG_SQUASHFS is not set		# CONFIG_SQUASHFS is not set
	# CONFIG_VXFS_FS is not set		# CONFIG_VXFS_FS is not set
	@@ -962,8 +986,10 @@ CONFIG_CRC32=y
	# CONFIG_CRC7 is not set		# CONFIG_CRC7 is not set
	# CONFIG_LIBCRC32C is not set		# CONFIG_LIBCRC32C is not set
	CONFIG_ZLIB_INFLATE=y		CONFIG_ZLIB_INFLATE=y
			CONFIG_LZO_DECOMPRESS=y
	CONFIG_DECOMPRESS_GZIP=y		CONFIG_DECOMPRESS_GZIP=y
	CONFIG_DECOMPRESS_BZIP2=y		CONFIG_DECOMPRESS_BZIP2=y
	CONFIG_DECOMPRESS_LZMA=y		CONFIG_DECOMPRESS_LZMA=y
			CONFIG_DECOMPRESS_LZO=y
	CONFIG_HAS_IOMEM=y		CONFIG_HAS_IOMEM=y
	CONFIG_HAS_DMA=y		CONFIG_HAS_DMA=y

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,7 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
	machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx		machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
	machine-$(CONFIG_ARCH_S5P6440) := s5p6440		machine-$(CONFIG_ARCH_S5P6440) := s5p6440
	machine-$(CONFIG_ARCH_S5P6442) := s5p6442		machine-$(CONFIG_ARCH_S5P6442) := s5p6442
	machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100		machine-$(CONFIG_ARCH_S5PC100) := s5pc100
	machine-$(CONFIG_ARCH_S5PV210) := s5pv210		machine-$(CONFIG_ARCH_S5PV210) := s5pv210
	machine-$(CONFIG_ARCH_SA1100) := sa1100		machine-$(CONFIG_ARCH_SA1100) := sa1100
	machine-$(CONFIG_ARCH_SHARK) := shark		machine-$(CONFIG_ARCH_SHARK) := shark
	@@ -198,7 +198,6 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik
	plat-$(CONFIG_PLAT_ORION) := orion		plat-$(CONFIG_PLAT_ORION) := orion
	plat-$(CONFIG_PLAT_PXA) := pxa		plat-$(CONFIG_PLAT_PXA) := pxa
	plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung
	plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung
	plat-$(CONFIG_PLAT_S5P) := s5p samsung		plat-$(CONFIG_PLAT_S5P) := s5p samsung
	plat-$(CONFIG_PLAT_SPEAR) := spear		plat-$(CONFIG_PLAT_SPEAR) := spear
	plat-$(CONFIG_PLAT_VERSATILE) := versatile		plat-$(CONFIG_PLAT_VERSATILE) := versatile