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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Add config files for Diamond 232L - Rev B processor variant
  xtensa: Fix io regions
  xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
  xtensa: replace remaining __FUNCTION__ occurrences
  xtensa: use newer __SPIN_LOCK_UNLOCKED macro
  XTENSA: warn about including <asm/rwsem.h> directly.
parents 94b6da5a 0025427e

arch/xtensa/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -64,7 +64,12 @@ choice 
	default XTENSA_VARIANT_FSF



config XTENSA_VARIANT_FSF

	bool "fsf"

	bool "fsf - default (not generic) configuration"



config XTENSA_VARIANT_DC232B

	bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"

	help

	This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).

endchoice



config MMU

arch/xtensa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
# (Use VAR=<xtensa_config> to use another default compiler.)



variant-$(CONFIG_XTENSA_VARIANT_FSF)		:= fsf

variant-$(CONFIG_XTENSA_VARIANT_DC232B)		:= dc232b

variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM)	:= custom



VARIANT = $(variant-y)

arch/xtensa/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) 


	if (irq >= NR_IRQS) {

		printk(KERN_EMERG "%s: cannot handle IRQ %d\n",

				__FUNCTION__, irq);

				__func__, irq);

	}



	irq_enter();

arch/xtensa/platforms/iss/network.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int iss_net_configure(int index, char *init) 
	*lp = ((struct iss_net_private) {

		.device_list		= LIST_HEAD_INIT(lp->device_list),

		.opened_list		= LIST_HEAD_INIT(lp->opened_list),

		.lock			= SPIN_LOCK_UNLOCKED,

		.lock			= __SPIN_LOCK_UNLOCKED(lp.lock),

		.dev			= dev,

		.index			= index,

		//.fd                   = -1,

drivers/net/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -464,6 +464,12 @@ config MIPS_JAZZ_SONIC 
	  This is the driver for the onboard card of MIPS Magnum 4000,

	  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.



config XTENSA_XT2000_SONIC

	tristate "Xtensa XT2000 onboard SONIC Ethernet support"

	depends on XTENSA_PLATFORM_XT2000

	help

	  This is the driver for the onboard card of the Xtensa XT2000 board.



config MIPS_AU1X00_ENET

	bool "MIPS AU1000 Ethernet support"

	depends on SOC_AU1X00