Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

Manual #include fixups for clashes - there may be some unnecessary
This commit is contained in:
Linus Torvalds 2005-10-31 07:32:56 -08:00
commit 4fd5f8267d
199 changed files with 260 additions and 156 deletions

View file

@ -50,7 +50,7 @@
#include <linux/list.h>
#include <linux/interrupt.h>
#include <linux/version.h>
#include <linux/platform_device.h>
#include <linux/usb.h>
#include <linux/usb_gadget.h>

View file

@ -21,6 +21,8 @@
*
*/
#include <linux/platform_device.h>
#include "lh7a40x_udc.h"
//#define DEBUG printk

View file

@ -38,7 +38,7 @@
#include <linux/proc_fs.h>
#include <linux/mm.h>
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
#include <linux/usb_otg.h>

View file

@ -43,7 +43,7 @@
#include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/mm.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <asm/byteorder.h>

View file

@ -70,6 +70,7 @@
#include <linux/interrupt.h>
#include <linux/usb.h>
#include <linux/usb_isp116x.h>
#include <linux/platform_device.h>
#include <asm/io.h>
#include <asm/irq.h>

View file

@ -18,6 +18,8 @@
* This file is licenced under the GPL.
*/
#include <linux/platform_device.h>
#include <asm/mach-au1x00/au1000.h>
#define USBH_ENABLE_BE (1<<0)

View file

@ -16,6 +16,8 @@
* This file is licenced under the GPL.
*/
#include <linux/platform_device.h>
#include <asm/hardware.h>

View file

@ -16,6 +16,7 @@
#include <linux/signal.h> /* SA_INTERRUPT */
#include <linux/jiffies.h>
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <asm/io.h>

View file

@ -14,6 +14,8 @@
* This file is licenced under the GPL.
*/
#include <linux/platform_device.h>
/* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */

View file

@ -21,6 +21,8 @@
#include <linux/device.h>
#include <linux/signal.h>
#include <linux/platform_device.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>

View file

@ -19,6 +19,8 @@
* This file is licenced under the GPL.
*/
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <asm/hardware/clock.h>
#include <asm/arch/usb-control.h>

View file

@ -54,6 +54,7 @@
#include <linux/interrupt.h>
#include <linux/usb.h>
#include <linux/usb_sl811.h>
#include <linux/platform_device.h>
#include <asm/io.h>
#include <asm/irq.h>

View file

@ -19,6 +19,7 @@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>