Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 003d6a38 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'sfi-base' into release 



Conflicts:
	drivers/acpi/power.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 71fd68e7 e55a5999

arch/x86/include/asm/acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) 


#else /* !CONFIG_ACPI */



#define acpi_disabled 1

#define acpi_lapic 0

#define acpi_ioapic 0

static inline void acpi_noirq_set(void) { }

arch/x86/pci/mmconfig-shared.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <asm/e820.h>

#include <asm/pci_x86.h>



#define PREFIX "PCI: "



/* aperture is up to 256MB but BIOS may reserve less */

#define MMCONFIG_APER_MIN	(2 * 1024*1024)

#define MMCONFIG_APER_MAX	(256 * 1024*1024)

drivers/acpi/ac.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>



#define PREFIX "ACPI: "



#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"

drivers/acpi/battery.c

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include <linux/power_supply.h>

#endif



#define PREFIX "ACPI: "



#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF



#define ACPI_BATTERY_CLASS		"battery"

drivers/acpi/blacklist.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <acpi/acpi_bus.h>

#include <linux/dmi.h>



#include "internal.h"



enum acpi_blacklist_predicates {

	all_versions,

	less_than_or_equal,