---

yaml
---
r: 298008
b: refs/heads/master
c: cf45013
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ff4b1cdbabb9ab9813f3d6e1cbec42cc5d6ed8
+refs/heads/master: cf450136bfde77c7f95065c91bffded4aa7fa731

trunk/Documentation/ABI/testing/sysfs-firmware-acpi

@@ -1,23 +1,3 @@
-What:		/sys/firmware/acpi/bgrt/
-Date:		January 2012
-Contact:	Matthew Garrett <mjg@redhat.com>
-Description:
-		The BGRT is an ACPI 5.0 feature that allows the OS
-		to obtain a copy of the firmware boot splash and
-		some associated metadata. This is intended to be used
-		by boot splash applications in order to interact with
-		the firmware boot splash in order to avoid jarring
-		transitions.
-
-		image: The image bitmap. Currently a 32-bit BMP.
-		status: 1 if the image is valid, 0 if firmware invalidated it.
-		type: 0 indicates image is in BMP format.
-		version: The version of the BGRT. Currently 1.
-		xoffset: The number of pixels between the left of the screen
-			 and the left edge of the image.
-		yoffset: The number of pixels between the top of the screen
-			 and the top edge of the image.
-
 What:		/sys/firmware/acpi/interrupts/
 Date:		February 2008
 Contact:	Len Brown <lenb@kernel.org>

trunk/drivers/acpi/Kconfig

@@ -384,15 +384,6 @@ config ACPI_CUSTOM_METHOD
 	  load additional kernel modules after boot, this feature may be used
 	  to override that restriction).
 
-config ACPI_BGRT
-        tristate "Boottime Graphics Resource Table support"
-        default n
-        help
-	  This driver adds support for exposing the ACPI Boottime Graphics
-	  Resource Table, which allows the operating system to obtain
-	  data from the firmware boot splash. It will appear under
-	  /sys/firmware/acpi/bgrt/ .
-
 source "drivers/acpi/apei/Kconfig"
 
 endif	# ACPI

trunk/drivers/acpi/Makefile

@@ -62,7 +62,6 @@ obj-$(CONFIG_ACPI_SBS)		+= sbs.o
 obj-$(CONFIG_ACPI_HED)		+= hed.o
 obj-$(CONFIG_ACPI_EC_DEBUGFS)	+= ec_sys.o
 obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
-obj-$(CONFIG_ACPI_BGRT)		+= bgrt.o
 
 # processor has its own "processor." module_param namespace
 processor-y			:= processor_driver.o processor_throttling.o

trunk/drivers/acpi/acpica/hwxface.c

@@ -74,8 +74,7 @@ acpi_status acpi_reset(void)
 
 	/* Check if the reset register is supported */
 
-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
-	    !reset_reg->address) {
+	if (!reset_reg->address) {
 		return_ACPI_STATUS(AE_NOT_EXIST);
 	}
 

trunk/drivers/acpi/bus.c

@@ -1010,7 +1010,6 @@ static int __init acpi_bus_init(void)
 }
 
 struct kobject *acpi_kobj;
-EXPORT_SYMBOL_GPL(acpi_kobj);
 
 static int __init acpi_init(void)
 {

trunk/drivers/acpi/reboot.c

@@ -23,8 +23,7 @@ void acpi_reboot(void)
 	/* Is the reset register supported? The spec says we should be
 	 * checking the bit width and bit offset, but Windows ignores
 	 * these fields */
-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER))
-		return;
+	/* Ignore also acpi_gbl_FADT.flags.ACPI_FADT_RESET_REGISTER */
 
 	reset_value = acpi_gbl_FADT.reset_value;