Incorporate ConstantMerge.h into IPO.h

llvm-svn: 3035
diff --git a/llvm/lib/Transforms/IPO/ConstantMerge.cpp b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
index 71eadbf..905c7a5 100644
--- a/llvm/lib/Transforms/IPO/ConstantMerge.cpp
+++ b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
@@ -14,13 +14,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/ConstantMerge.h"
+#include "llvm/Transforms/IPO.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "Support/StatisticReporter.h"
 
-static Statistic<> NumMerged("constmerge\t\t- Number of global constants merged");
-
 namespace {
   struct ConstantMerge : public Pass {
     // run - For this pass, process all of the globals in the module,
@@ -33,6 +31,7 @@
     }
   };
 
+Statistic<> NumMerged("constmerge\t\t- Number of global constants merged");
 RegisterPass<ConstantMerge> X("constmerge", "Merge Duplicate Global Constants");
 }