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

Commit 0676fc12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 912cbe3c d56c524a

arch/arm/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -704,8 +704,7 @@ source "drivers/acorn/block/Kconfig" 




if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE

	|| MACH_MP1000

source "drivers/ide/Kconfig"

source "drivers/ide/Kconfig"

endif

endif

arch/arm/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ comma = , 
# macro, but instead defines a whole series of macros which makes

# macro, but instead defines a whole series of macros which makes

# testing for a specific architecture or later rather impossible.

# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

arch-$(CONFIG_CPU_32v6K)	:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4)

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4)

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3

arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3
@@ -143,7 +144,7 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ 
drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

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

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

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





libs-y				+= arch/arm/lib/

libs-y				:= arch/arm/lib/ $(libs-y)





# Default target when executing plain make

# Default target when executing plain make

ifeq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_XIP_KERNEL),y)

arch/arm/boot/compressed/head.S

+1 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,7 @@ 
    defined(CONFIG_ARCH_IXP4XX) || \

    defined(CONFIG_ARCH_IXP4XX) || \

    defined(CONFIG_ARCH_IXP2000) || \

    defined(CONFIG_ARCH_IXP2000) || \

    defined(CONFIG_ARCH_LH7A40X) || \

    defined(CONFIG_ARCH_LH7A40X) || \

    defined(CONFIG_ARCH_OMAP) || \

    defined(CONFIG_ARCH_OMAP)

    defined(CONFIG_MACH_MP1000)

		.macro	loadsp,	rb

		.macro	loadsp,	rb

		addruart \rb

		addruart \rb

		.endm

		.endm

arch/arm/configs/ixdp2401_defconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware"

CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware"

# CONFIG_XIP_KERNEL is not set

# CONFIG_XIP_KERNEL is not set





#

#
@@ -560,7 +560,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
#

#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_NR_UARTS=3

# CONFIG_SERIAL_8250_EXTENDED is not set

# CONFIG_SERIAL_8250_EXTENDED is not set





#

#

arch/arm/configs/ixdp2801_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
#

#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_NR_UARTS=3

# CONFIG_SERIAL_8250_EXTENDED is not set

# CONFIG_SERIAL_8250_EXTENDED is not set





#

#