diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 17:02:14 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 17:02:14 +0900 |
| commit | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (patch) | |
| tree | 59799c3d7b7d4a088abdfa3052c3682ed826ba7e /scripts/kconfig/expr.h | |
| parent | f017eb299c3ac219215ce896718ea128ad9343eb (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
Diffstat (limited to 'scripts/kconfig/expr.h')
| -rw-r--r-- | scripts/kconfig/expr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index bd2e09895553..cdd48600e02a 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -12,7 +12,7 @@ extern "C" { #include <assert.h> #include <stdio.h> -#include <sys/queue.h> +#include "list.h" #ifndef __cplusplus #include <stdbool.h> #endif @@ -175,12 +175,11 @@ struct menu { #define MENU_ROOT 0x0002 struct jump_key { - CIRCLEQ_ENTRY(jump_key) entries; + struct list_head entries; size_t offset; struct menu *target; int index; }; -CIRCLEQ_HEAD(jk_head, jump_key); #define JUMP_NB 9 |