Merge http://linux-isdn.bkbits.net/linux-2.5.misc

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

drivers/block/floppy.c

@@ -3859,7 +3859,9 @@ static int check_floppy_change(kdev_t dev)
 static int floppy_revalidate(kdev_t dev)
 {
 #define NO_GEOM (!current_type[drive] && !TYPE(dev))
+#if 0
 	struct buffer_head * bh;
+#endif
 	int drive=DRIVE(dev);
 	int cf;
 

drivers/scsi/sd.c

@@ -61,7 +61,7 @@
 
 #include <linux/genhd.h>
 
-static char sd_version_str[] = "Version: 2.0.3 (20020417)";
+/* static char sd_version_str[] = "Version: 2.0.3 (20020417)"; */
 
 #define SD_MAJOR(i) (!(i) ? SCSI_DISK0_MAJOR : SCSI_DISK1_MAJOR-1+(i))
 

fs/dnotify.c

@@ -135,7 +135,6 @@ void __inode_dir_notify(struct inode *inode, unsigned long event)
 	}
 	if (changed)
 		redo_inode_mask(inode);
-out:
 	write_unlock(&dn_lock);
 }
 

fs/ext2/balloc.c

@@ -14,6 +14,7 @@
 #include <linux/config.h>
 #include "ext2.h"
 #include <linux/quotaops.h>
+#include <linux/sched.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines

fs/ext2/ialloc.c

@@ -15,6 +15,7 @@
 #include <linux/config.h>
 #include "ext2.h"
 #include <linux/quotaops.h>
+#include <linux/sched.h>
 
 
 /*

net/ipv4/netfilter/ip_nat_core.c

@@ -203,6 +203,7 @@ find_appropriate_src(const struct ip_conntrack_tuple *tuple,
 		return NULL;
 }
 
+#ifdef CONFIG_IP_NF_NAT_LOCAL
 /* If it's really a local destination manip, it may need to do a
    source manip too. */
 static int
@@ -221,6 +222,7 @@ do_extra_mangle(u_int32_t var_ip, u_int32_t *other_ipp)
 	ip_rt_put(rt);
 	return 1;
 }
+#endif
 
 /* Simple way to iterate through all. */
 static inline int fake_cmp(const struct ip_nat_hash *i,