diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-12-07 13:58:10 -0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-08 20:36:31 +0100 |
| commit | c40fae9525e6c29c87a4f4361ff0a8d67a36e448 (patch) | |
| tree | 00c3e0008b3e963c5a622245b951f1135e456c24 /arch/arm/plat-omap/common.c | |
| parent | f4e4c324a5f81f18156499d1ade3732ba1f5b523 (diff) | |
| download | kernel_samsung_aries-c40fae9525e6c29c87a4f4361ff0a8d67a36e448.zip kernel_samsung_aries-c40fae9525e6c29c87a4f4361ff0a8d67a36e448.tar.gz kernel_samsung_aries-c40fae9525e6c29c87a4f4361ff0a8d67a36e448.tar.bz2 | |
ARM: OMAP: Sync core code with linux-omap
This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 57b7b93..ffb94aa 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -93,8 +93,12 @@ static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out) * in the kernel. */ for (i = 0; i < omap_board_config_size; i++) { if (omap_board_config[i].tag == tag) { - kinfo = &omap_board_config[i]; - break; + if (skip == 0) { + kinfo = &omap_board_config[i]; + break; + } else { + skip--; + } } } if (kinfo == NULL) |