Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

2007-05-09 10:41:28 +01:00
parent 23688e999e b85fe92766 c5f125031f cc150b03ae
commit 805f53f085
67 changed files with 2704 additions and 975 deletions
--- 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)