diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /arch/arm/plat-omap/common.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index ea967a8f6ce5..6cb20aea7f51 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/hardware/clock.h> | 26 | #include <asm/hardware/clock.h> |
| 27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 29 | #include <asm/setup.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/arch/board.h> | 31 | #include <asm/arch/board.h> |
| 31 | #include <asm/arch/mux.h> | 32 | #include <asm/arch/mux.h> |
| @@ -35,11 +36,11 @@ | |||
| 35 | 36 | ||
| 36 | #define NO_LENGTH_CHECK 0xffffffff | 37 | #define NO_LENGTH_CHECK 0xffffffff |
| 37 | 38 | ||
| 38 | extern int omap_bootloader_tag_len; | 39 | unsigned char omap_bootloader_tag[512]; |
| 39 | extern u8 omap_bootloader_tag[]; | 40 | int omap_bootloader_tag_len; |
| 40 | 41 | ||
| 41 | struct omap_board_config_kernel *omap_board_config; | 42 | struct omap_board_config_kernel *omap_board_config; |
| 42 | int omap_board_config_size = 0; | 43 | int omap_board_config_size; |
| 43 | 44 | ||
| 44 | static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out) | 45 | static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out) |
| 45 | { | 46 | { |