diff options
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/configs/common_defconfig | 5 | ||||
-rw-r--r-- | arch/xtensa/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/init_task.c | 31 | ||||
-rw-r--r-- | arch/xtensa/variants/s6000/dmac.c | 2 | ||||
-rw-r--r-- | arch/xtensa/variants/s6000/gpio.c | 4 | ||||
-rw-r--r-- | arch/xtensa/variants/s6000/include/variant/dmac.h | 2 | ||||
-rw-r--r-- | arch/xtensa/variants/s6000/irq.c | 4 |
7 files changed, 7 insertions, 43 deletions
diff --git a/arch/xtensa/configs/common_defconfig b/arch/xtensa/configs/common_defconfig index b90038e40dd..a182a4e6d68 100644 --- a/arch/xtensa/configs/common_defconfig +++ b/arch/xtensa/configs/common_defconfig | |||
@@ -333,11 +333,6 @@ CONFIG_XT2000_SONIC=y | |||
333 | # CONFIG_S2IO is not set | 333 | # CONFIG_S2IO is not set |
334 | 334 | ||
335 | # | 335 | # |
336 | # Token Ring devices | ||
337 | # | ||
338 | # CONFIG_TR is not set | ||
339 | |||
340 | # | ||
341 | # Wireless LAN (non-hamradio) | 336 | # Wireless LAN (non-hamradio) |
342 | # | 337 | # |
343 | CONFIG_NET_RADIO=y | 338 | CONFIG_NET_RADIO=y |
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 2d2728b3e86..59fc3fe1557 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile | |||
@@ -6,7 +6,7 @@ extra-y := head.o vmlinux.lds | |||
6 | 6 | ||
7 | obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o \ | 7 | obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o \ |
8 | setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ | 8 | setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ |
9 | pci-dma.o init_task.o io.o | 9 | pci-dma.o io.o |
10 | 10 | ||
11 | obj-$(CONFIG_KGDB) += xtensa-stub.o | 11 | obj-$(CONFIG_KGDB) += xtensa-stub.o |
12 | obj-$(CONFIG_PCI) += pci.o | 12 | obj-$(CONFIG_PCI) += pci.o |
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c deleted file mode 100644 index cd122fb7e48..00000000000 --- a/arch/xtensa/kernel/init_task.c +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * arch/xtensa/kernel/init_task.c | ||
3 | * | ||
4 | * Xtensa Processor version. | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | * | ||
10 | * Copyright (C) 2007 Tensilica Inc. | ||
11 | * | ||
12 | * Chris Zankel <chris@zankel.net> | ||
13 | */ | ||
14 | |||
15 | #include <linux/mm.h> | ||
16 | #include <linux/fs.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/init_task.h> | ||
19 | #include <linux/module.h> | ||
20 | #include <linux/mqueue.h> | ||
21 | |||
22 | #include <asm/uaccess.h> | ||
23 | |||
24 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
25 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
26 | union thread_union init_thread_union __init_task_data = | ||
27 | { INIT_THREAD_INFO(init_task) }; | ||
28 | |||
29 | struct task_struct init_task = INIT_TASK(init_task); | ||
30 | |||
31 | EXPORT_SYMBOL(init_task); | ||
diff --git a/arch/xtensa/variants/s6000/dmac.c b/arch/xtensa/variants/s6000/dmac.c index dc7f7c57351..340f5bb0b5e 100644 --- a/arch/xtensa/variants/s6000/dmac.c +++ b/arch/xtensa/variants/s6000/dmac.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Authors: Oskar Schirmer <os@emlix.com> | 2 | * Authors: Oskar Schirmer <oskar@scara.com> |
3 | * Daniel Gloeckner <dg@emlix.com> | 3 | * Daniel Gloeckner <dg@emlix.com> |
4 | * (c) 2008 emlix GmbH http://www.emlix.com | 4 | * (c) 2008 emlix GmbH http://www.emlix.com |
5 | * | 5 | * |
diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c index 7af0757e001..b89541ba39a 100644 --- a/arch/xtensa/variants/s6000/gpio.c +++ b/arch/xtensa/variants/s6000/gpio.c | |||
@@ -2,8 +2,8 @@ | |||
2 | * s6000 gpio driver | 2 | * s6000 gpio driver |
3 | * | 3 | * |
4 | * Copyright (c) 2009 emlix GmbH | 4 | * Copyright (c) 2009 emlix GmbH |
5 | * Authors: Oskar Schirmer <os@emlix.com> | 5 | * Authors: Oskar Schirmer <oskar@scara.com> |
6 | * Johannes Weiner <jw@emlix.com> | 6 | * Johannes Weiner <hannes@cmpxchg.org> |
7 | * Daniel Gloeckner <dg@emlix.com> | 7 | * Daniel Gloeckner <dg@emlix.com> |
8 | */ | 8 | */ |
9 | #include <linux/bitops.h> | 9 | #include <linux/bitops.h> |
diff --git a/arch/xtensa/variants/s6000/include/variant/dmac.h b/arch/xtensa/variants/s6000/include/variant/dmac.h index e81735b2a20..3f88d9fc689 100644 --- a/arch/xtensa/variants/s6000/include/variant/dmac.h +++ b/arch/xtensa/variants/s6000/include/variant/dmac.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * Copyright (C) 2006 Tensilica Inc. | 8 | * Copyright (C) 2006 Tensilica Inc. |
9 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> | 9 | * Copyright (C) 2008 Emlix GmbH <info@emlix.com> |
10 | * Authors: Fabian Godehardt <fg@emlix.com> | 10 | * Authors: Fabian Godehardt <fg@emlix.com> |
11 | * Oskar Schirmer <os@emlix.com> | 11 | * Oskar Schirmer <oskar@scara.com> |
12 | * Daniel Gloeckner <dg@emlix.com> | 12 | * Daniel Gloeckner <dg@emlix.com> |
13 | */ | 13 | */ |
14 | 14 | ||
diff --git a/arch/xtensa/variants/s6000/irq.c b/arch/xtensa/variants/s6000/irq.c index 6651e3285fc..81a241e7907 100644 --- a/arch/xtensa/variants/s6000/irq.c +++ b/arch/xtensa/variants/s6000/irq.c | |||
@@ -2,8 +2,8 @@ | |||
2 | * s6000 irq crossbar | 2 | * s6000 irq crossbar |
3 | * | 3 | * |
4 | * Copyright (c) 2009 emlix GmbH | 4 | * Copyright (c) 2009 emlix GmbH |
5 | * Authors: Johannes Weiner <jw@emlix.com> | 5 | * Authors: Johannes Weiner <hannes@cmpxchg.org> |
6 | * Oskar Schirmer <os@emlix.com> | 6 | * Oskar Schirmer <oskar@scara.com> |
7 | */ | 7 | */ |
8 | #include <linux/io.h> | 8 | #include <linux/io.h> |
9 | #include <asm/irq.h> | 9 | #include <asm/irq.h> |