From a213542258aff4537fcf986d4d69ba5694e4a463 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 20 Oct 2006 15:17:02 -0400
Subject: [PATCH] --- yaml --- r: 42071 b: refs/heads/master c:
 f23f6e08c47acbdd20e9c49a79da8c404ea168e1 h: refs/heads/master i:   42069:
 a00c930781ba467fb395fcc33642e72774002e3d   42067:
 a42c9af442e3b4874b3253bb55ae81e3cf2c09a9   42063:
 4bd312791c4f292ba565157255f2508bdf35901d v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/char/hpet.c                     | 1 +
 trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 1 +
 trunk/include/linux/poll.h                    | 3 ++-
 trunk/include/sound/pcm.h                     | 1 +
 trunk/sound/oss/cs46xx.c                      | 1 +
 trunk/sound/oss/dmabuf.c                      | 1 +
 trunk/sound/oss/emu10k1/audio.c               | 1 +
 trunk/sound/oss/es1371.c                      | 1 +
 trunk/sound/oss/i810_audio.c                  | 1 +
 trunk/sound/oss/soundcard.c                   | 1 +
 trunk/sound/oss/sscape.c                      | 1 +
 trunk/sound/oss/trident.c                     | 1 +
 13 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a50f9a0038fe..00486362be78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7fe0f241dceade9c8d4af75498765c5ff7f27e6
+refs/heads/master: f23f6e08c47acbdd20e9c49a79da8c404ea168e1
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index 091a11cd878c..20dc3be5ecfc 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -21,6 +21,7 @@
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <linux/mm.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/sysctl.h>
diff --git a/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c b/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c
index 55bc891768c2..8a7dd507cf6e 100644
--- a/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/trunk/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -30,6 +30,7 @@
 #include <linux/input.h>
 #include <linux/dvb/frontend.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include "dmxdev.h"
 #include "dvb_demux.h"
diff --git a/trunk/include/linux/poll.h b/trunk/include/linux/poll.h
index 51e1b56741fb..27690798623f 100644
--- a/trunk/include/linux/poll.h
+++ b/trunk/include/linux/poll.h
@@ -8,7 +8,8 @@
 #include <linux/compiler.h>
 #include <linux/wait.h>
 #include <linux/string.h>
-#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 
 /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating
diff --git a/trunk/include/sound/pcm.h b/trunk/include/sound/pcm.h
index afaf3e88e086..2f645dfd7f70 100644
--- a/trunk/include/sound/pcm.h
+++ b/trunk/include/sound/pcm.h
@@ -26,6 +26,7 @@
 #include <sound/asound.h>
 #include <sound/memalloc.h>
 #include <linux/poll.h>
+#include <linux/mm.h>
 #include <linux/bitops.h>
 
 #define snd_pcm_substream_chip(substream) ((substream)->private_data)
diff --git a/trunk/sound/oss/cs46xx.c b/trunk/sound/oss/cs46xx.c
index b1c5d8286e40..147c8a951137 100644
--- a/trunk/sound/oss/cs46xx.c
+++ b/trunk/sound/oss/cs46xx.c
@@ -91,6 +91,7 @@
 #include <linux/poll.h>
 #include <linux/ac97_codec.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
diff --git a/trunk/sound/oss/dmabuf.c b/trunk/sound/oss/dmabuf.c
index b256c0401161..eaf69971bf92 100644
--- a/trunk/sound/oss/dmabuf.c
+++ b/trunk/sound/oss/dmabuf.c
@@ -25,6 +25,7 @@
 #define BE_CONSERVATIVE
 #define SAMPLE_ROUNDUP 0
 
+#include <linux/mm.h>
 #include "sound_config.h"
 
 #define DMAP_FREE_ON_CLOSE      0
diff --git a/trunk/sound/oss/emu10k1/audio.c b/trunk/sound/oss/emu10k1/audio.c
index cde4d59d5430..86dd23974e05 100644
--- a/trunk/sound/oss/emu10k1/audio.c
+++ b/trunk/sound/oss/emu10k1/audio.c
@@ -36,6 +36,7 @@
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <linux/sched.h>
+#include <linux/mm.h>
 #include <linux/smp_lock.h>
 
 #include "hwaccess.h"
diff --git a/trunk/sound/oss/es1371.c b/trunk/sound/oss/es1371.c
index ddf6b0a0bca5..cc282a0cd539 100644
--- a/trunk/sound/oss/es1371.c
+++ b/trunk/sound/oss/es1371.c
@@ -130,6 +130,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
diff --git a/trunk/sound/oss/i810_audio.c b/trunk/sound/oss/i810_audio.c
index 240cc7939b69..c3c8a720d555 100644
--- a/trunk/sound/oss/i810_audio.c
+++ b/trunk/sound/oss/i810_audio.c
@@ -101,6 +101,7 @@
 #include <linux/ac97_codec.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/uaccess.h>
 
diff --git a/trunk/sound/oss/soundcard.c b/trunk/sound/oss/soundcard.c
index 75c5e745705f..8fb8e7f99556 100644
--- a/trunk/sound/oss/soundcard.c
+++ b/trunk/sound/oss/soundcard.c
@@ -42,6 +42,7 @@
 #include <linux/proc_fs.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 
 /*
  * This ought to be moved into include/asm/dma.h
diff --git a/trunk/sound/oss/sscape.c b/trunk/sound/oss/sscape.c
index 51f2fa615413..30c36d1f35d7 100644
--- a/trunk/sound/oss/sscape.c
+++ b/trunk/sound/oss/sscape.c
@@ -39,6 +39,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/mm.h>
 #include <linux/spinlock.h>
 
 #include "coproc.h"
diff --git a/trunk/sound/oss/trident.c b/trunk/sound/oss/trident.c
index 7a363a178afd..6b1f8c9cdcf8 100644
--- a/trunk/sound/oss/trident.c
+++ b/trunk/sound/oss/trident.c
@@ -216,6 +216,7 @@
 #include <linux/gameport.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>