Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[pandora-kernel.git] / scripts / kconfig / qconf.h

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index a397edb..b3b5657 100644 (file)
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -273,15 +273,13 @@ protected:
        struct symbol *sym;
        struct menu *menu;
        bool _showDebug;
-
-       int has_dbg_info;
 };
 
 class ConfigSearchWindow : public QDialog {
        Q_OBJECT
        typedef class QDialog Parent;
 public:
-       ConfigSearchWindow(QWidget* parent, const char *name = 0);
+       ConfigSearchWindow(ConfigMainWindow* parent, const char *name = 0);
 
 public slots:
        void saveSettings(void);