diff options
author | Hubert Feurstein <hubert.feurstein@contec.at> | 2009-10-07 03:36:07 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-07 08:15:14 -0400 |
commit | 941500954470e04679ff6e3cff0f82d8dbd2b6c3 (patch) | |
tree | 25b69adca81f3bd1448a95e84a073056f79f0cb0 | |
parent | 4918a01393a38db4346ae88f38c1fd8324bb5e63 (diff) |
ARM: 5749/1: ep93xx/micro9: Update maintainer
Update Contec Micro9 maintainer and add entry in MAINTAINERS
Cc: Ryan Mallon <ryan@bluewatersys.com>
Requires: 5744/1
Signed-off-by: Hubert Feurstein <hubert.feurstein@contec.at>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Manfred Gruber <m.gruber@tirol.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | MAINTAINERS | 5 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 09a2028bab7f..1401a85b93ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -577,6 +577,11 @@ M: Mike Rapoport <mike@compulab.co.il> | |||
577 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 577 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
578 | S: Maintained | 578 | S: Maintained |
579 | 579 | ||
580 | ARM/CONTEC MICRO9 MACHINE SUPPORT | ||
581 | M: Hubert Feurstein <hubert.feurstein@contec.at> | ||
582 | S: Maintained | ||
583 | F: arch/arm/mach-ep93xx/micro9.c | ||
584 | |||
580 | ARM/CORGI MACHINE SUPPORT | 585 | ARM/CORGI MACHINE SUPPORT |
581 | M: Richard Purdie <rpurdie@rpsys.net> | 586 | M: Richard Purdie <rpurdie@rpsys.net> |
582 | S: Maintained | 587 | S: Maintained |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 0a313e82fb74..72e7a7dfd7bf 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -2,7 +2,9 @@ | |||
2 | * linux/arch/arm/mach-ep93xx/micro9.c | 2 | * linux/arch/arm/mach-ep93xx/micro9.c |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH | 4 | * Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH |
5 | * Manfred Gruber <manfred.gruber@contec.at> | 5 | * Manfred Gruber <m.gruber@tirol.com> |
6 | * Copyright (C) 2009 Contec Steuerungstechnik & Automation GmbH | ||
7 | * Hubert Feurstein <hubert.feurstein@contec.at> | ||
6 | * | 8 | * |
7 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
@@ -66,7 +68,7 @@ static void __init micro9h_init_machine(void) | |||
66 | } | 68 | } |
67 | 69 | ||
68 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") | 70 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") |
69 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 71 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
70 | .phys_io = EP93XX_APB_PHYS_BASE, | 72 | .phys_io = EP93XX_APB_PHYS_BASE, |
71 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 73 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
72 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 74 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
@@ -88,7 +90,7 @@ static void __init micro9m_init_machine(void) | |||
88 | } | 90 | } |
89 | 91 | ||
90 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") | 92 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") |
91 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 93 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
92 | .phys_io = EP93XX_APB_PHYS_BASE, | 94 | .phys_io = EP93XX_APB_PHYS_BASE, |
93 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 95 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
94 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 96 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
@@ -110,7 +112,7 @@ static void __init micro9l_init_machine(void) | |||
110 | } | 112 | } |
111 | 113 | ||
112 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") | 114 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") |
113 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 115 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
114 | .phys_io = EP93XX_APB_PHYS_BASE, | 116 | .phys_io = EP93XX_APB_PHYS_BASE, |
115 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 117 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
116 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 118 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |