1 files changed, 8 insertions, 13 deletions
diff --git a/include/llvm/Support/Disassembler.h b/include/llvm/System/Disassembler.h
index 3d0d798de8..37a8761499 100644
--- a/include/llvm/Support/Disassembler.h
+++ b/include/llvm/System/Disassembler.h
@@ -12,25 +12,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SUPPORT_DISASSEMBLER_H
-#define LLVM_SUPPORT_DISASSEMBLER_H
+#ifndef LLVM_SYSTEM_DISASSEMBLER_H
+#define LLVM_SYSTEM_DISASSEMBLER_H
 
 #include "llvm/Support/DataTypes.h"
 #include <string>
 
 namespace llvm {
+namespace sys {
 
-namespace Disassembler {
-  enum Type {
-    X86_32,
-    X86_64,
-    Undefined
-  };
-}
-  
+/// This function provides some "glue" code to call external disassembler
+/// libraries.
+std::string disassembleBuffer(uint8_t* start, size_t length, uint64_t pc = 0);
 
-std::string disassembleBuffer(uint8_t* start, size_t length,
-                              Disassembler::Type type, uint64_t pc);
+}
 }
 
-#endif // LLVM_SUPPORT_DISASSEMBLER_H
+#endif // LLVM_SYSTEM_DISASSEMBLER_H