You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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:
@@ -1,7 +1,6 @@
|
||||
#ifndef __SAA7146__
|
||||
#define __SAA7146__
|
||||
|
||||
#include <linux/module.h> /* for module-version */
|
||||
#include <linux/delay.h> /* for delay-stuff */
|
||||
#include <linux/slab.h> /* for kmalloc/kfree */
|
||||
#include <linux/pci.h> /* for pci-config-stuff, vendor ids etc. */
|
||||
@@ -55,6 +54,8 @@ do { \
|
||||
#define SAA7146_ISR_CLEAR(x,y) \
|
||||
saa7146_write(x, ISR, (y));
|
||||
|
||||
struct module;
|
||||
|
||||
struct saa7146_dev;
|
||||
struct saa7146_extension;
|
||||
struct saa7146_vv;
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
#ifndef V4L2_INT_DEVICE_H
|
||||
#define V4L2_INT_DEVICE_H
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <media/v4l2-common.h>
|
||||
|
||||
#define V4L2NAMESIZE 32
|
||||
@@ -41,6 +40,8 @@ enum v4l2_int_type {
|
||||
v4l2_int_type_slave
|
||||
};
|
||||
|
||||
struct module;
|
||||
|
||||
struct v4l2_int_device;
|
||||
|
||||
struct v4l2_int_master {
|
||||
|
||||
Reference in New Issue
Block a user