diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
| commit | a3b072cd180c12e8fe0ece9487b9065808327640 (patch) | |
| tree | 62b982041be84748852d77cdf6ca5639ef40858f /drivers/misc/eeprom/eeprom.c | |
| parent | 75a1ba5b2c529db60ca49626bcaf0bddf4548438 (diff) | |
| parent | 081cd62a010f97b5bc1d2b0cd123c5abc692b68a (diff) | |
Merge tag 'efi-urgent' into x86/urgent
* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/misc/eeprom/eeprom.c')
| -rw-r--r-- | drivers/misc/eeprom/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index c169e07654cb..f0fa4e8ca124 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Philip Edelbrock <phil@netroedge.com> | 3 | * Philip Edelbrock <phil@netroedge.com> |
| 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> | 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> |
| 5 | * Copyright (C) 2003 IBM Corp. | 5 | * Copyright (C) 2003 IBM Corp. |
| 6 | * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> | 6 | * Copyright (C) 2004 Jean Delvare <jdelvare@suse.de> |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |