Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c
index 3c92c83733f4..725d61c0fb43 100644
--- a/scripts/mod/mk_elfconfig.c
+++ b/scripts/mod/mk_elfconfig.c
@@ -28,7 +28,7 @@ main(int argc, char **argv)
                 printf("#define KERNEL_ELFCLASS ELFCLASS64\n");
                 break;
         default:
-                abort();
+                exit(1);
         }
         switch (ei[EI_DATA]) {
         case ELFDATA2LSB:
@@ -38,7 +38,7 @@ main(int argc, char **argv)
                 printf("#define KERNEL_ELFDATA ELFDATA2MSB\n");
                 break;
         default:
-                abort();
+                exit(1);
         }
 
         if (sizeof(unsigned long) == 4) {
@@ -53,7 +53,7 @@ main(int argc, char **argv)
         else if (memcmp(endian_test.c, "\x02\x01", 2) == 0)
                 printf("#define HOST_ELFDATA ELFDATA2LSB\n");
         else
-                abort();
+                exit(1);
 
         if ((strcmp(argv[1], "v850") == 0) || (strcmp(argv[1], "h8300") == 0))
                 printf("#define MODULE_SYMBOL_PREFIX \"_\"\n");