From 673251fe69099294bc42c89e968181d3bc2c9b97 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Mon, 20 Jan 2014 17:18:16 +0000
Subject: Merging linaro-edk2-2014.01-rc1 into linaro-tracking.

---
 BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp')

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 363ca82a2..addff24cf 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -855,17 +855,6 @@ CFormPkg::DeclarePendingQuestion (
       // Get VarStoreType
       //
       ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId);
-      if (ReturnCode == VFR_RETURN_UNDEFINED) {
-        lCVfrDataStorage.DeclareBufferVarStore (
-                           FName, 
-                           LocalFormSetGuid, 
-                           &lCVfrVarDataTypeDB, 
-                           FName,
-                           EFI_VARSTORE_ID_INVALID,
-                           FALSE
-                           );
-        ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId, LocalFormSetGuid); 
-      }
       if (ReturnCode != VFR_RETURN_SUCCESS) {
         gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined");
         return ReturnCode;
-- 
cgit v1.2.3