diff options
Diffstat (limited to 'arch/xtensa')
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/xtensa/variants/s6000/dmac.c b/arch/xtensa/variants/s6000/dmac.c index dc7f7c573518..340f5bb0b5ef 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 7af0757e001b..b89541ba39ab 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 e81735b2a206..3f88d9fc6897 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 6651e3285fcf..81a241e79075 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> |