diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-13 18:06:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-13 18:06:28 +0100 |
| commit | 5453a3df2a5eb49bc24615d4cf0d66b2aae05e5f (patch) | |
| tree | 1afe217f7de7e956039f3b72298aaf99a741a8b7 /scripts/kconfig/qconf.h | |
| parent | Merge tag 'pwm/for-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | kconfig: fix 'Save As' menu of xconfig (diff) | |
| download | linux-5453a3df2a5eb49bc24615d4cf0d66b2aae05e5f.tar.xz linux-5453a3df2a5eb49bc24615d4cf0d66b2aae05e5f.zip | |
Merge tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kconfig updates from Masahiro Yamada:
- rename lexer and parse files
- fix 'Save as' menu of xconfig
* tag 'kconfig-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: fix 'Save As' menu of xconfig
kconfig: rename zconf.y to parser.y
kconfig: rename zconf.l to lexer.l
Diffstat (limited to 'scripts/kconfig/qconf.h')
| -rw-r--r-- | scripts/kconfig/qconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index 41df466e67d9..45bfe9b2b966 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -291,6 +291,7 @@ protected: class ConfigMainWindow : public QMainWindow { Q_OBJECT + char *configname; static QAction *saveAction; static void conf_changed(void); public: |