diff options
-rw-r--r-- | flash.h | 6 | ||||
-rw-r--r-- | print.c | 7 | ||||
-rw-r--r-- | print_wiki.c | 6 |
3 files changed, 10 insertions, 9 deletions
@@ -309,12 +309,6 @@ struct board_info { #endif }; -#ifdef CONFIG_PRINT_WIKI -#define B(vendor, name, status, url, note) { vendor, name, status, url, note } -#else -#define B(vendor, name, status, url, note) { vendor, name, status } -#endif - extern const struct board_info boards_known[]; extern const struct board_info laptops_known[]; @@ -245,6 +245,13 @@ void print_supported(void) } #if CONFIG_INTERNAL == 1 + +#ifdef CONFIG_PRINT_WIKI +#define B(vendor, name, status, url, note) { vendor, name, status, url, note } +#else +#define B(vendor, name, status, url, note) { vendor, name, status } +#endif + /* Please keep this list alphabetically ordered by vendor/board. */ const struct board_info boards_known[] = { #if defined(__i386__) || defined(__x86_64__) diff --git a/print_wiki.c b/print_wiki.c index 6e1aec3..b85bf19 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -145,9 +145,9 @@ static void wiki_helper(const char *devicetype, int cols, color = !color; k = 0; - while ((b[k].vendor_name != NULL) - && strcmp(b[k].vendor_name, boards[i].vendor) - && strcmp(b[k].board_name, boards[i].name)) { + while ((b[k].vendor_name != NULL) && + (strcmp(b[k].vendor_name, boards[i].vendor) || + strcmp(b[k].board_name, boards[i].name))) { k++; } |