diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2014-10-23 08:26:29 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2014-10-23 08:26:29 +0100 |
| commit | a015b3a8a08ddbeec8b536686d880248dc028e11 (patch) | |
| tree | c5c46507ef86ed735d995e23827db9dd5c06ac4d /ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf | |
| parent | 3a194a21e2a9eb5a22d59cbd03f155753a039fce (diff) | |
| parent | f4affe6f42ba5ea4d50ca65253dafa9b278ea260 (diff) | |
Merge branch 'linaro-platform-juno' into integrationintegration/14.10integration
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Diffstat (limited to 'ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf')
| -rw-r--r-- | ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf index 1a5bb6d10..9cdde1f15 100644 --- a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf +++ b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf @@ -3,6 +3,7 @@ #
# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+# Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -21,7 +22,6 @@ MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = EfiResetSystemLib
- CONSTRUCTOR = ArmPsciResetSystemLibConstructor
[Sources]
ArmPsciResetSystemLib.c
@@ -35,7 +35,3 @@ DebugLib
BaseLib
ArmSmcLib
- ArmHvcLib
-
-[Pcd]
- gArmTokenSpaceGuid.PcdArmPsciMethod
|