Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
MODULE_AUTHOR("Louis Davis/Jim Dailey");
|
||||
MODULE_DESCRIPTION("Dell LED Control Driver");
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/mfd/88pm860x.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#define LED_PWM_SHIFT (3)
|
||||
#define LED_PWM_MASK (0x1F)
|
||||
|
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <linux/mfd/asic3.h>
|
||||
#include <linux/mfd/core.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
/*
|
||||
* The HTC ASIC3 LED GPIOs are inputs, not outputs.
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/atmel_pwm.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
|
||||
struct pwmled {
|
||||
|
@@ -24,6 +24,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/export.h>
|
||||
|
||||
#define LED_WEB 0x04
|
||||
#define LED_POWER_OFF 0x08
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/module.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <asm/gpio.h>
|
||||
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <linux/led-lm3530.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#define LM3530_LED_DEV "lcd-backlight"
|
||||
#define LM3530_NAME "lm3530-led"
|
||||
|
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/leds.h>
|
||||
|
||||
|
@@ -24,6 +24,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
struct lt3593_led_data {
|
||||
struct led_classdev cdev;
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <asm/io.h>
|
||||
#include <linux/nsc_gpio.h>
|
||||
#include <linux/scx200_gpio.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#define DRVNAME "net48xx-led"
|
||||
#define NET48XX_ERROR_LED_GPIO 20
|
||||
|
@@ -16,6 +16,7 @@
|
||||
#include <linux/leds.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <asm/geode.h>
|
||||
|
||||
|
@@ -28,6 +28,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/module.h>
|
||||
#include <mach/leds-ns2.h>
|
||||
|
||||
/*
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#include <linux/leds.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
@@ -18,6 +18,7 @@
|
||||
#include <linux/mfd/wm831x/core.h>
|
||||
#include <linux/mfd/wm831x/pdata.h>
|
||||
#include <linux/mfd/wm831x/status.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
|
||||
struct wm831x_status {
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#include <linux/mfd/wm8350/pmic.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
/* Microamps */
|
||||
static const int isink_cur[] = {
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#include <linux/err.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/scx200_gpio.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#define DRVNAME "wrap-led"
|
||||
#define WRAP_POWER_LED_GPIO 2
|
||||
|
Reference in New Issue
Block a user