Skip to content

Commit

Permalink
ARM: OMAP: Remove remaining board-*.h includes from hardware.h
Browse files Browse the repository at this point in the history
Also remove board-omap3beagle.h that is not included anywhere,
and move protoype for voiceblue_reset() from board-voiceblue.h
to system.h.

After this patch there are still board-ams-delta.h, board-sx1.h
and board-voiceblue.h that export some functions. These could
be removed if the functions were moved under drivers.

Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tony Lindgren committed Mar 24, 2009
1 parent d40cdf0 commit 6b0147c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 56 deletions.
33 changes: 0 additions & 33 deletions arch/arm/plat-omap/include/mach/board-omap3beagle.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/arm/plat-omap/include/mach/board-voiceblue.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
extern void voiceblue_wdt_enable(void);
extern void voiceblue_wdt_disable(void);
extern void voiceblue_wdt_ping(void);
extern void voiceblue_reset(void);

#endif /* __ASM_ARCH_VOICEBLUE_H */

22 changes: 0 additions & 22 deletions arch/arm/plat-omap/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,26 +286,4 @@
#include "omap24xx.h"
#include "omap34xx.h"

#ifndef __ASSEMBLER__

/*
* ---------------------------------------------------------------------------
* Board specific defines
* ---------------------------------------------------------------------------
*/

#ifdef CONFIG_MACH_OMAP3_BEAGLE
#include "board-omap3beagle.h"
#endif

#ifdef CONFIG_MACH_VOICEBLUE
#include "board-voiceblue.h"
#endif

#ifdef CONFIG_MACH_SX1
#include "board-sx1.h"
#endif

#endif /* !__ASSEMBLER__ */

#endif /* __ASM_ARCH_OMAP_HARDWARE_H */
2 changes: 2 additions & 0 deletions arch/arm/plat-omap/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

#ifndef CONFIG_MACH_VOICEBLUE
#define voiceblue_reset() do {} while (0)
#else
extern void voiceblue_reset(void);
#endif

extern void omap_prcm_arch_reset(char mode);
Expand Down

0 comments on commit 6b0147c

Please sign in to comment.