[llvm-branch-commits] [llvm-branch] r168333 - in /llvm/branches/release_32: ./ lib/Target/NVPTX/NVPTXSubtarget.h

[Pawel Wodnicki]

Author: pawel
Date: Mon Nov 19 16:11:50 2012
New Revision: 168333

URL: http://llvm.org/viewvc/llvm-project?rev=168333&view=rev
Log:
Merging r167719 into the 3.2 relase branch

Remove unused field.

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/lib/Target/NVPTX/NVPTXSubtarget.h

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 19 16:11:50 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167731,167743,167750,167784,167811,167817,167942,167966
+/llvm/trunk:155241,167719,167731,167743,167750,167784,167811,167817,167942,167966

Modified: llvm/branches/release_32/lib/Target/NVPTX/NVPTXSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/lib/Target/NVPTX/NVPTXSubtarget.h?rev=168333&r1=168332&r2=168333&view=diff
==============================================================================
--- llvm/branches/release_32/lib/Target/NVPTX/NVPTXSubtarget.h (original)
+++ llvm/branches/release_32/lib/Target/NVPTX/NVPTXSubtarget.h Mon Nov 19 16:11:50 2012
@@ -28,7 +28,6 @@
   
   std::string TargetName;
   NVPTX::DrvInterface drvInterface;
-  bool dummy; // For the 'dummy' feature, see NVPTX.td
   bool Is64Bit;
 
   // PTX version x.y is represented as 10*x+y, e.g. 3.1 == 31