From e33f7342301148f95523028702053d997cbecf49 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernux@us.ibm.com>
Date: Tue, 2 Nov 2010 13:08:11 -0700
Subject: [PATCH] --- yaml --- r: 222984 b: refs/heads/master c:
 1d37db77c1aa199ae9a4114af7c0412c8417e949 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/platform/x86/ibm_rtl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b9f3e52665eb..9c9386bb2a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2262260f9eaee4acd56b5624b5d2bf4be9bb38a
+refs/heads/master: 1d37db77c1aa199ae9a4114af7c0412c8417e949
diff --git a/trunk/drivers/platform/x86/ibm_rtl.c b/trunk/drivers/platform/x86/ibm_rtl.c
index 5c975edb3c81..94a114aa8e28 100644
--- a/trunk/drivers/platform/x86/ibm_rtl.c
+++ b/trunk/drivers/platform/x86/ibm_rtl.c
@@ -28,6 +28,7 @@
 #include <linux/io.h>
 #include <linux/sysdev.h>
 #include <linux/dmi.h>
+#include <linux/efi.h>
 #include <linux/mutex.h>
 #include <asm/bios_ebda.h>
 
@@ -238,7 +239,7 @@ static int __init ibm_rtl_init(void) {
 	if (force)
 		pr_warning("ibm-rtl: module loaded by force\n");
 	/* first ensure that we are running on IBM HW */
-	else if (!dmi_check_system(ibm_rtl_dmi_table))
+	else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table))
 		return -ENODEV;
 
 	/* Get the address for the Extended BIOS Data Area */