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

Commit 5c23804a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:~rmk/linux-2.6-arm.git

parents 58c853c6 ec6bced6

arch/arm/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@ source "arch/arm/mach-pxa/Kconfig" 


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



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

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



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



source "arch/arm/mach-s3c2410/Kconfig"
@@ -514,7 +516,7 @@ config XIP_PHYS_ADDR 


endmenu



if (ARCH_SA1100 || ARCH_INTEGRATOR)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)



menu "CPU Frequency scaling"

arch/arm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000 
 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_OMAP)	   := omap

 machine-$(CONFIG_ARCH_OMAP1)	   := omap1

  incdir-$(CONFIG_ARCH_OMAP)	   := omap

 machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410

 machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x

 machine-$(CONFIG_ARCH_VERSATILE)  := versatile
@@ -142,6 +143,9 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ 
core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)

core-$(CONFIG_VFP)		+= arch/arm/vfp/



# If we have a common platform directory, then include it in the build.

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

drivers-$(CONFIG_ARCH_L7200)	+= drivers/acorn/char/

arch/arm/configs/enp2611_defconfig

+5 −15
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-git6

# Sat Jun 25 00:57:29 2005

# Linux kernel version: 2.6.13-rc2

# Thu Jul  7 16:41:21 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -137,6 +137,7 @@ CONFIG_PCI_NAMES=y 
#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y
@@ -345,10 +346,9 @@ CONFIG_PACKET_MMAP=y 
CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_FIB_TRIE is not set

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y
@@ -363,17 +363,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_TUNNEL is not set

# CONFIG_IP_TCPDIAG is not set

# CONFIG_IP_TCPDIAG_IPV6 is not set



#

# TCP congestion control

#

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_WESTWOOD=m

CONFIG_TCP_CONG_HTCP=m

# CONFIG_TCP_CONG_HSTCP is not set

# CONFIG_TCP_CONG_HYBLA is not set

# CONFIG_TCP_CONG_VEGAS is not set

# CONFIG_TCP_CONG_SCALABLE is not set

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set
@@ -931,4 +922,3 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y
 
# CONFIG_TEXTSEARCH is not set

arch/arm/configs/ixdp2400_defconfig

+5 −15
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-git6

# Sat Jun 25 00:58:38 2005

# Linux kernel version: 2.6.13-rc2

# Thu Jul  7 16:49:01 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y 
#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y 
CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_FIB_TRIE is not set

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_TUNNEL is not set

# CONFIG_IP_TCPDIAG is not set

# CONFIG_IP_TCPDIAG_IPV6 is not set



#

# TCP congestion control

#

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_WESTWOOD=m

CONFIG_TCP_CONG_HTCP=m

# CONFIG_TCP_CONG_HSTCP is not set

# CONFIG_TCP_CONG_HYBLA is not set

# CONFIG_TCP_CONG_VEGAS is not set

# CONFIG_TCP_CONG_SCALABLE is not set

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set
@@ -932,4 +923,3 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y
 
# CONFIG_TEXTSEARCH is not set

arch/arm/configs/ixdp2401_defconfig

+5 −15
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-git6

# Sat Jun 25 00:59:35 2005

# Linux kernel version: 2.6.13-rc2

# Thu Jul  7 16:49:08 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -138,6 +138,7 @@ CONFIG_PCI_NAMES=y 
#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y
@@ -346,10 +347,9 @@ CONFIG_PACKET_MMAP=y 
CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_FIB_TRIE is not set

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y
@@ -364,17 +364,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

# CONFIG_IP_TCPDIAG_IPV6 is not set



#

# TCP congestion control

#

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_WESTWOOD=m

CONFIG_TCP_CONG_HTCP=m

# CONFIG_TCP_CONG_HSTCP is not set

# CONFIG_TCP_CONG_HYBLA is not set

# CONFIG_TCP_CONG_VEGAS is not set

# CONFIG_TCP_CONG_SCALABLE is not set

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set
@@ -933,4 +924,3 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y
 
# CONFIG_TEXTSEARCH is not set