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

Manual #include fixups for clashes - there may be some unnecessary
2005-10-31 07:32:56 -08:00
parent eb16292ba8 8576762ff5
commit 4fd5f8267d
199 changed files with 260 additions and 156 deletions
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -52,6 +52,8 @@
 * 4) AFAICT, hardware flow control isn't supported by the controller --MAG.
 */

+#include <linux/platform_device.h>
+
 #include "mpsc.h"

 /*