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

Commit cf4d3779 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.8-4' of... 

Merge tag 'platform-drivers-x86-v4.8-4' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Remove module related code from two drivers that are only configurable
  as built-in: intel_pmic_gpio and platform/olpc"

* tag 'platform-drivers-x86-v4.8-4' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  intel_pmic_gpio: Make explicitly non-modular
  platform/olpc: Make ec explicitly non-modular
parents 2a90309e da43bf0c

drivers/platform/olpc/olpc-ec.c

+3 −5
Original line number Diff line number Diff line 
/*

 * Generic driver for the OLPC Embedded Controller.

 *

 * Author: Andres Salomon <dilinger@queued.net>

 *

 * Copyright (C) 2011-2012 One Laptop per Child Foundation.

 *

 * Licensed under the GPL v2 or later.
@@ -12,7 +14,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/list.h>

#include <linux/olpc-ec.h>

#include <asm/olpc.h>
@@ -326,8 +328,4 @@ static int __init olpc_ec_init_module(void) 
{

	return platform_driver_register(&olpc_ec_plat_driver);

}



arch_initcall(olpc_ec_init_module);
 


MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");

MODULE_LICENSE("GPL");

drivers/platform/x86/intel_pmic_gpio.c

+2 −6
Original line number Diff line number Diff line 
/* Moorestown PMIC GPIO (access through IPC) driver

 * Copyright (c) 2008 - 2009, Intel Corporation.

 *

 * Author: Alek Du <alek.du@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.
@@ -21,7 +23,6 @@ 


#define pr_fmt(fmt) "%s: " fmt, __func__



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/delay.h>
@@ -322,9 +323,4 @@ static int __init platform_pmic_gpio_init(void) 
{

	return platform_driver_register(&platform_pmic_gpio_driver);

}



subsys_initcall(platform_pmic_gpio_init);
 


MODULE_AUTHOR("Alek Du <alek.du@intel.com>");

MODULE_DESCRIPTION("Intel Moorestown PMIC GPIO driver");

MODULE_LICENSE("GPL v2");