Merge branch 'smp/hotplug' into sched/core, to resolve conflicts

[linux-2.6-block.git] / scripts / sortextable.c

diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 62a1822e0f41beece4606304c4ce0412bbd5e4cb..f453b7ce99d66a66ebd7d8981b6eeaa8269da442 100644 (file)
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -315,6 +315,7 @@ do_file(char const *const fname)
 
        case EM_S390:
        case EM_AARCH64:
+       case EM_PARISC:
                custom_sort = sort_relative_table;
                break;
        case EM_ARCOMPACT: