Merge branch 'master'

diff --git a/.gitignore b/.gitignore
index 5014bfa48ac169e0748e1e9651897788feb306dc..a4b576eb9c00311392c203755663f9f4a29e8477 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ Module.symvers
 # Generated include files
 #
 include/asm
+include/asm-*/asm-offsets.h
 include/config
 include/linux/autoconf.h
 include/linux/compile.h

diff --git a/arch/x86_64/boot/.gitignore b/arch/x86_64/boot/.gitignore
new file mode 100644 (file)
index 0000000..495f20c
--- /dev/null
+++ b/arch/x86_64/boot/.gitignore
@@ -0,0 +1,3 @@
+bootsect
+bzImage
+setup

diff --git a/arch/x86_64/boot/tools/.gitignore b/arch/x86_64/boot/tools/.gitignore
new file mode 100644 (file)
index 0000000..378eac2
--- /dev/null
+++ b/arch/x86_64/boot/tools/.gitignore
@@ -0,0 +1 @@
+build

diff --git a/arch/x86_64/ia32/.gitignore b/arch/x86_64/ia32/.gitignore
new file mode 100644 (file)
index 0000000..48ab174
--- /dev/null
+++ b/arch/x86_64/ia32/.gitignore
@@ -0,0 +1 @@
+vsyscall*.so

diff --git a/drivers/char/.gitignore b/drivers/char/.gitignore
index 2b6b1d772ed776fff87927fc34adc2e40500218e..73dfdcebfbba64a725a99fbb637242e07c1c5071 100644 (file)
--- a/drivers/char/.gitignore
+++ b/drivers/char/.gitignore
@@ -1,3 +1,3 @@
 consolemap_deftbl.c
 defkeymap.c
-
+qtronixmap.c

diff --git a/drivers/ieee1394/.gitignore b/drivers/ieee1394/.gitignore
new file mode 100644 (file)
index 0000000..33da10a
--- /dev/null
+++ b/drivers/ieee1394/.gitignore
@@ -0,0 +1 @@
+oui.c

diff --git a/drivers/md/.gitignore b/drivers/md/.gitignore
new file mode 100644 (file)
index 0000000..a7afec6
--- /dev/null
+++ b/drivers/md/.gitignore
@@ -0,0 +1,4 @@
+mktables
+raid6altivec*.c
+raid6int*.c
+raid6tables.c

diff --git a/drivers/net/wan/.gitignore b/drivers/net/wan/.gitignore
new file mode 100644 (file)
index 0000000..dae3ea6
--- /dev/null
+++ b/drivers/net/wan/.gitignore
@@ -0,0 +1 @@
+wanxlfw.inc

diff --git a/drivers/scsi/.gitignore b/drivers/scsi/.gitignore
new file mode 100644 (file)
index 0000000..b385af3
--- /dev/null
+++ b/drivers/scsi/.gitignore
@@ -0,0 +1,3 @@
+53c700_d.h
+53c7xx_d.h
+53c7xx_u.h

diff --git a/drivers/scsi/aic7xxx/.gitignore b/drivers/scsi/aic7xxx/.gitignore
new file mode 100644 (file)
index 0000000..b8ee24d
--- /dev/null
+++ b/drivers/scsi/aic7xxx/.gitignore
@@ -0,0 +1,6 @@
+aic79xx_reg.h
+aic79xx_reg_print.c
+aic79xx_seq.h
+aic7xxx_reg.h
+aic7xxx_reg_print.c
+aic7xxx_seq.h

diff --git a/include/asm-mips/.gitignore b/include/asm-mips/.gitignore
deleted file mode 100644 (file)
index 4ec57ad..0000000
--- a/include/asm-mips/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-asm_offsets.h

diff --git a/kernel/.gitignore b/kernel/.gitignore
new file mode 100644 (file)
index 0000000..f2ab700
--- /dev/null
+++ b/kernel/.gitignore
@@ -0,0 +1,5 @@
+#
+# Generated files
+#
+config_data.h
+config_data.gz

diff --git a/scripts/.gitignore b/scripts/.gitignore
index b46d68bb9e170fac6fc127a6aee8771ec4b14b57..a234e524a4901ad05c11a818575ed23e82c1e265 100644 (file)
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,4 +1,7 @@
+#
+# Generated files
+#
 conmakehash
 kallsyms
 pnmtologo
-
+bin2c

diff --git a/scripts/genksyms/.gitignore b/scripts/genksyms/.gitignore
new file mode 100644 (file)
index 0000000..be5cadb
--- /dev/null
+++ b/scripts/genksyms/.gitignore
@@ -0,0 +1,4 @@
+keywords.c
+lex.c
+parse.[ch]
+genksyms

diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 2dac3442e0ac3e8ac586493cddf56fc1ed4d21f2..e8ad1f6b3da4891f5996735afa64603ae018f916 100644 (file)
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -5,6 +5,7 @@ config*
 lex.*.c
 *.tab.c
 *.tab.h
+zconf.hash.c
 
 #
 # configuration programs

diff --git a/scripts/kconfig/lxdialog/.gitignore b/scripts/kconfig/lxdialog/.gitignore
new file mode 100644 (file)
index 0000000..90b08ff
--- /dev/null
+++ b/scripts/kconfig/lxdialog/.gitignore
@@ -0,0 +1,4 @@
+#
+# Generated files
+#
+lxdialog

diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 3fb681fb9632d96f9cd2839039311c82ea70bc1f..db07ae73e051f62a50421d10e1e2e0dc277136fc 100644 (file)
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -23,7 +23,7 @@
 
 #include "dialog.h"
 
-static int list_width, check_x, item_x, checkflag;
+static int list_width, check_x, item_x;
 
 /*
  * Print list item
@@ -41,10 +41,7 @@ static void print_item(WINDOW * win, const char *item, int status, int choice,
 
        wmove(win, choice, check_x);
        wattrset(win, selected ? check_selected_attr : check_attr);
-       if (checkflag == FLAG_CHECK)
-               wprintw(win, "[%c]", status ? 'X' : ' ');
-       else
-               wprintw(win, "(%c)", status ? 'X' : ' ');
+       wprintw(win, "(%c)", status ? 'X' : ' ');
 
        wattrset(win, selected ? tag_selected_attr : tag_attr);
        mvwaddch(win, choice, item_x, item[0]);
@@ -109,18 +106,16 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 
 /*
  * Display a dialog box with a list of options that can be turned on or off
- * The `flag' parameter is used to select between radiolist and checklist.
+ * in the style of radiolist (only one option turned on at a time).
  */
 int dialog_checklist(const char *title, const char *prompt, int height,
                     int width, int list_height, int item_no,
-                    const char *const *items, int flag)
+                    const char *const *items)
 {
        int i, x, y, box_x, box_y;
        int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
        WINDOW *dialog, *list;
 
-       checkflag = flag;
-
        /* Allocate space for storing item on/off status */
        if ((status = malloc(sizeof(int) * item_no)) == NULL) {
                endwin();
@@ -303,34 +298,20 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                case ' ':
                case '\n':
                        if (!button) {
-                               if (flag == FLAG_CHECK) {
-                                       status[scroll + choice] = !status[scroll + choice];
-                                       wmove(list, choice, check_x);
-                                       wattrset(list, check_selected_attr);
-                                       wprintw(list, "[%c]", status[scroll + choice] ? 'X' : ' ');
-                               } else {
-                                       if (!status[scroll + choice]) {
-                                               for (i = 0; i < item_no; i++)
-                                                       status[i] = 0;
-                                               status[scroll + choice] = 1;
-                                               for (i = 0; i < max_choice; i++)
-                                                       print_item(list, items[(scroll + i) * 3 + 1],
-                                                                  status[scroll + i], i, i == choice);
-                                       }
+                               if (!status[scroll + choice]) {
+                                       for (i = 0; i < item_no; i++)
+                                               status[i] = 0;
+                                       status[scroll + choice] = 1;
+                                       for (i = 0; i < max_choice; i++)
+                                               print_item(list, items[(scroll + i) * 3 + 1],
+                                                          status[scroll + i], i, i == choice);
                                }
                                wnoutrefresh(list);
                                wrefresh(dialog);
 
-                               for (i = 0; i < item_no; i++) {
-                                       if (status[i]) {
-                                               if (flag == FLAG_CHECK) {
-                                                       fprintf(stderr, "\"%s\" ", items[i * 3]);
-                                               } else {
-                                                       fprintf(stderr, "%s", items[i * 3]);
-                                               }
-
-                                       }
-                               }
+                               for (i = 0; i < item_no; i++)
+                                       if (status[i])
+                                               fprintf(stderr, "%s", items[i * 3]);
                        } else
                                fprintf(stderr, "%s", items[(scroll + choice) * 3]);
                        delwin(dialog);

diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index f882204cb3c279d5492732c89241dc8c2e19bb29..af3cf716e2156ca4c9dbada932497af069d230a6 100644 (file)
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -160,7 +160,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                const char *const *items);
 int dialog_checklist(const char *title, const char *prompt, int height,
                     int width, int list_height, int item_no,
-                    const char *const *items, int flag);
+                    const char *const *items);
 extern char dialog_input_result[];
 int dialog_inputbox(const char *title, const char *prompt, int height,
                    int width, const char *init);
@@ -175,10 +175,3 @@ int dialog_inputbox(const char *title, const char *prompt, int height,
  *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
  */
 #define M_EVENT (KEY_MAX+1)
-
-/*
- * The `flag' parameter in checklist is used to select between
- * radiolist and checklist
- */
-#define FLAG_CHECK 1
-#define FLAG_RADIO 0

diff --git a/scripts/kconfig/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
index 2c34ea1e0a41f3ac25f62719ca2a222f04ea0692..79f6c5fb5cef812df3473f7985cfc44a5bcdc936 100644 (file)
--- a/scripts/kconfig/lxdialog/lxdialog.c
+++ b/scripts/kconfig/lxdialog/lxdialog.c
@@ -31,12 +31,11 @@ struct Mode {
        jumperFn *jumper;
 };
 
-jumperFn j_menu, j_checklist, j_radiolist, j_yesno, j_textbox, j_inputbox;
+jumperFn j_menu, j_radiolist, j_yesno, j_textbox, j_inputbox;
 jumperFn j_msgbox, j_infobox;
 
 static struct Mode modes[] = {
        {"--menu", 9, 0, 3, j_menu},
-       {"--checklist", 9, 0, 3, j_checklist},
        {"--radiolist", 9, 0, 3, j_radiolist},
        {"--yesno", 5, 5, 1, j_yesno},
        {"--textbox", 5, 5, 1, j_textbox},
@@ -151,7 +150,6 @@ static void Usage(const char *name)
 \nBox options:\
 \n\
 \n  --menu      <text> <height> <width> <menu height> <tag1> <item1>...\
-\n  --checklist <text> <height> <width> <list height> <tag1> <item1> <status1>...\
 \n  --radiolist <text> <height> <width> <list height> <tag1> <item1> <status1>...\
 \n  --textbox   <file> <height> <width>\
 \n  --inputbox  <text> <height> <width> [<init>]\
@@ -170,16 +168,10 @@ int j_menu(const char *t, int ac, const char *const *av)
                           atoi(av[5]), av[6], (ac - 6) / 2, av + 7);
 }
 
-int j_checklist(const char *t, int ac, const char *const *av)
-{
-       return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),
-                               atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_CHECK);
-}
-
 int j_radiolist(const char *t, int ac, const char *const *av)
 {
        return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),
-                               atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_RADIO);
+                               atoi(av[5]), (ac - 6) / 3, av + 6);
 }
 
 int j_textbox(const char *t, int ac, const char *const *av)