diff options
| author | Tony Lindgren <tony@atomide.com> | 2005-09-07 17:20:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-07 17:20:27 +0100 |
| commit | 9839c6b8dd414612be0b6a70c4aa06eaca5b7652 (patch) | |
| tree | 06d766c7c0c2b765efde677c8d538c010713d325 /include/asm-arm/arch-omap/board-voiceblue.h | |
| parent | 92105bb70634abacc08bbe12bf6f888fbd7dad38 (diff) | |
[ARM] 2888/1: OMAP 3/4: Update omap include files, take 2
Patch from Tony Lindgren
This patch syncs the mainline kernel with linux-omap tree.
The highlights of the patch are:
- Start adding 24xx support by Paul Mundt
- Clean-up of cpu detection by Dirk Behme and Tony Lindgren
- Add DSP header by Toshihiro Kobayashi
- Add support for mtd-xip by Vladimir Barinov
- Add various new mux registers
- Move OMAP specific serial defines back to serial.h
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-omap/board-voiceblue.h')
| -rw-r--r-- | include/asm-arm/arch-omap/board-voiceblue.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-arm/arch-omap/board-voiceblue.h b/include/asm-arm/arch-omap/board-voiceblue.h index 33977b8956f..ed6d346ee12 100644 --- a/include/asm-arm/arch-omap/board-voiceblue.h +++ b/include/asm-arm/arch-omap/board-voiceblue.h @@ -11,11 +11,6 @@ #ifndef __ASM_ARCH_VOICEBLUE_H #define __ASM_ARCH_VOICEBLUE_H -#if (EXTERNAL_MAX_NR_PORTS < 4) -#undef EXTERNAL_MAX_NR_PORTS -#define EXTERNAL_MAX_NR_PORTS 4 -#endif - extern void voiceblue_wdt_enable(void); extern void voiceblue_wdt_disable(void); extern void voiceblue_wdt_ping(void); |