diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/xtensa/Kconfig | 7 | ||||
-rw-r--r-- | arch/xtensa/Makefile | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/xtensa/platforms/iss/network.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index a213260b51e5..6c873dceb177 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -64,7 +64,12 @@ choice | |||
64 | default XTENSA_VARIANT_FSF | 64 | default XTENSA_VARIANT_FSF |
65 | 65 | ||
66 | config XTENSA_VARIANT_FSF | 66 | config XTENSA_VARIANT_FSF |
67 | bool "fsf" | 67 | bool "fsf - default (not generic) configuration" |
68 | |||
69 | config XTENSA_VARIANT_DC232B | ||
70 | bool "dc232b - Diamond 232L Standard Core Rev.B (LE)" | ||
71 | help | ||
72 | This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE). | ||
68 | endchoice | 73 | endchoice |
69 | 74 | ||
70 | config MMU | 75 | config MMU |
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 4bd1e14c6b90..015b6b2a26b9 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
@@ -14,6 +14,7 @@ | |||
14 | # (Use VAR=<xtensa_config> to use another default compiler.) | 14 | # (Use VAR=<xtensa_config> to use another default compiler.) |
15 | 15 | ||
16 | variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf | 16 | variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf |
17 | variant-$(CONFIG_XTENSA_VARIANT_DC232B) := dc232b | ||
17 | variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom | 18 | variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom |
18 | 19 | ||
19 | VARIANT = $(variant-y) | 20 | VARIANT = $(variant-y) |
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c index c9ea73b7031b..5fbcde59a92d 100644 --- a/arch/xtensa/kernel/irq.c +++ b/arch/xtensa/kernel/irq.c | |||
@@ -48,7 +48,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) | |||
48 | 48 | ||
49 | if (irq >= NR_IRQS) { | 49 | if (irq >= NR_IRQS) { |
50 | printk(KERN_EMERG "%s: cannot handle IRQ %d\n", | 50 | printk(KERN_EMERG "%s: cannot handle IRQ %d\n", |
51 | __FUNCTION__, irq); | 51 | __func__, irq); |
52 | } | 52 | } |
53 | 53 | ||
54 | irq_enter(); | 54 | irq_enter(); |
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index a2e252217428..11a20adc1409 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c | |||
@@ -640,7 +640,7 @@ static int iss_net_configure(int index, char *init) | |||
640 | *lp = ((struct iss_net_private) { | 640 | *lp = ((struct iss_net_private) { |
641 | .device_list = LIST_HEAD_INIT(lp->device_list), | 641 | .device_list = LIST_HEAD_INIT(lp->device_list), |
642 | .opened_list = LIST_HEAD_INIT(lp->opened_list), | 642 | .opened_list = LIST_HEAD_INIT(lp->opened_list), |
643 | .lock = SPIN_LOCK_UNLOCKED, | 643 | .lock = __SPIN_LOCK_UNLOCKED(lp.lock), |
644 | .dev = dev, | 644 | .dev = dev, |
645 | .index = index, | 645 | .index = index, |
646 | //.fd = -1, | 646 | //.fd = -1, |