diff options
| -rw-r--r-- | arch/arm/mach-mx3/mx31ads.c | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/hardware.h | 32 |
2 files changed, 17 insertions, 16 deletions
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c index 7e89bdc23a9f..5addbb7f711c 100644 --- a/arch/arm/mach-mx3/mx31ads.c +++ b/arch/arm/mach-mx3/mx31ads.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <asm/memory.h> | 29 | #include <asm/memory.h> |
| 30 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
| 31 | #include <asm/arch/common.h> | 31 | #include <asm/arch/common.h> |
| 32 | #include <asm/arch/board-mx31ads.h> | ||
| 32 | 33 | ||
| 33 | /*! | 34 | /*! |
| 34 | * @file mx31ads.c | 35 | * @file mx31ads.c |
diff --git a/include/asm-arm/arch-mxc/hardware.h b/include/asm-arm/arch-mxc/hardware.h index e87ff0679d5e..4ed2d8072d03 100644 --- a/include/asm-arm/arch-mxc/hardware.h +++ b/include/asm-arm/arch-mxc/hardware.h | |||
| @@ -1,11 +1,20 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. | 2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. |
| 3 | */ | 3 | * Copyright 2008 Juergen Beisert, kernel@pengutronix.de |
| 4 | 4 | * | |
| 5 | /* | 5 | * This program is free software; you can redistribute it and/or |
| 6 | * This program is free software; you can redistribute it and/or modify | 6 | * modify it under the terms of the GNU General Public License |
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * as published by the Free Software Foundation; either version 2 |
| 8 | * published by the Free Software Foundation. | 8 | * of the License, or (at your option) any later version. |
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program; if not, write to the Free Software | ||
| 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| 17 | * MA 02110-1301, USA. | ||
| 9 | */ | 18 | */ |
| 10 | 19 | ||
| 11 | #ifndef __ASM_ARCH_MXC_HARDWARE_H__ | 20 | #ifndef __ASM_ARCH_MXC_HARDWARE_H__ |
| @@ -19,13 +28,4 @@ | |||
| 19 | 28 | ||
| 20 | #include <asm/arch/mxc.h> | 29 | #include <asm/arch/mxc.h> |
| 21 | 30 | ||
| 22 | /* | ||
| 23 | * --------------------------------------------------------------------------- | ||
| 24 | * Board specific defines | ||
| 25 | * --------------------------------------------------------------------------- | ||
| 26 | */ | ||
| 27 | #ifdef CONFIG_MACH_MX31ADS | ||
| 28 | # include <asm/arch/board-mx31ads.h> | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ | 31 | #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ |