3 files changed, 9 insertions, 14 deletions
diff --git a/OptionRomPkg/UndiRuntimeDxe/Init.c b/OptionRomPkg/UndiRuntimeDxe/Init.c
index 9410fe167a..4e4327005f 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Init.c
+++ b/OptionRomPkg/UndiRuntimeDxe/Init.c
@@ -1,7 +1,7 @@
 /** @file
   Initialization functions for EFI UNDI32 driver.
 
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -99,7 +99,7 @@ UndiNotifyVirtual (
 **/
 VOID
 EFIAPI
-UndiNotifyExitBs (
+UndiNotifyReadyToBoot (
   EFI_EVENT Event,
   VOID      *Context
   )
@@ -1028,9 +1028,9 @@ InitializeUndi(
   Status = gBS->CreateEventEx (
                   EVT_NOTIFY_SIGNAL,
                   TPL_NOTIFY,
-                  UndiNotifyExitBs,
+                  UndiNotifyReadyToBoot,
                   NULL,
-                  &gEfiEventExitBootServicesGuid,
+                  &gEfiEventReadyToBootGuid,
                   &Event
                   );
   ASSERT_EFI_ERROR (Status);
diff --git a/OptionRomPkg/UndiRuntimeDxe/Undi32.h b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
index 2bc019ef24..d09761d59d 100644
--- a/OptionRomPkg/UndiRuntimeDxe/Undi32.h
+++ b/OptionRomPkg/UndiRuntimeDxe/Undi32.h
@@ -1,7 +1,7 @@
 /** @file
   EFI internal structures for the EFI UNDI driver.
 
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -176,13 +176,6 @@ UNDI_notify_virtual (
   VOID      *context
   );
 
-VOID
-EFIAPI
-UndiNotifyExitBs (
-  EFI_EVENT Event,
-  VOID      *Context
-  );
-
 EFI_STATUS
 EFIAPI
 UndiDriverSupported (
diff --git a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
index 654c5fc6a8..4be7044be7 100644
--- a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
+++ b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
@@ -1,8 +1,10 @@
 ## @file
 # Component description file for Undi module.
 #
-# This module provides support for Universal Network Driver Interface
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# This module provides support for Universal Network Driver Interface. 
+# Notes: this module is no longer regular maintained/validated.
+#
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License