Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/R600/AMDILDeviceInfo.cpp

 //===-- AMDILDeviceInfo.cpp - AMDILDeviceInfo class -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //==-----------------------------------------------------------------------===//
 //
 /// \file
@@ skipping 63 matching lines @@
     return new AMDGPUCaymanDevice(ptr);
   } else if (deviceName == "caicos") {
 #if DEBUG
     assert(!is64bit && "This device does not support 64bit pointers!");
     assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
     return new AMDGPUNIDevice(ptr);
   } else if (deviceName == "SI" ||
              deviceName == "tahiti" || deviceName == "pitcairn" ||
-             deviceName == "verde"  || deviceName == "oland" ||
-             deviceName == "hainan") {
+             deviceName == "verde"  || deviceName == "oland") {
     return new AMDGPUSIDevice(ptr);
   } else {
 #if DEBUG
     assert(!is64bit && "This device does not support 64bit pointers!");
     assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
     return new AMDGPU7XXDevice(ptr);
   }
 }
 } // End namespace AMDGPUDeviceInfo
 } // End namespace llvm