diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:42:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:42:48 +0200 |
| commit | 273b5a4836966eb192af9d01d0cdef2e30585864 (patch) | |
| tree | fbde818e08decfd015972c3af6f9229c4a1b358c /drivers/acpi/pmic/intel_pmic_xpower.c | |
| parent | Merge branches 'acpi-processor', 'acpi-cppc', 'acpi-apei' and 'acpi-sleep' (diff) | |
| parent | ACPI / PMIC: remove modular references from non-modular code (diff) | |
| download | linux-dev-273b5a4836966eb192af9d01d0cdef2e30585864.tar.xz linux-dev-273b5a4836966eb192af9d01d0cdef2e30585864.zip | |
Merge branch 'acpi-pmic'
* acpi-pmic:
ACPI / PMIC: remove modular references from non-modular code
ACPI / PMIC: intel: initialize result to 0
ACPI / PMIC: intel: add REGS operation region support
ACPI / PMIC: Add opregion driver for Intel BXT WhiskeyCove PMIC
ACPI / PMIC: modify the pen function signature to take bit field
Conflicts:
drivers/acpi/Makefile
Diffstat (limited to 'drivers/acpi/pmic/intel_pmic_xpower.c')
| -rw-r--r-- | drivers/acpi/pmic/intel_pmic_xpower.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c index 6a082d4de12c..e6e991ac20f3 100644 --- a/drivers/acpi/pmic/intel_pmic_xpower.c +++ b/drivers/acpi/pmic/intel_pmic_xpower.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/acpi.h> #include <linux/mfd/axp20x.h> #include <linux/regmap.h> @@ -262,7 +262,4 @@ static int __init intel_xpower_pmic_opregion_driver_init(void) { return platform_driver_register(&intel_xpower_pmic_opregion_driver); } -module_init(intel_xpower_pmic_opregion_driver_init); - -MODULE_DESCRIPTION("XPower AXP288 ACPI operation region driver"); -MODULE_LICENSE("GPL"); +device_initcall(intel_xpower_pmic_opregion_driver_init); |