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
199 changed files with 260 additions and 156 deletions

View File

@@ -13,7 +13,7 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/ioport.h>
#include <asm/io.h>
#include <asm/mach/irq.h>