Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

2 files changed, 1 insertions, 4 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 48638c8097a5..846a533323a8 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -94,7 +94,7 @@ config MTD_NETSC520
 
 config MTD_TS5500
         tristate "JEDEC Flash device mapped on Technologic Systems TS-5500"
-        depends on ELAN
+        depends on X86
         select MTD_PARTITIONS
         select MTD_JEDECPROBE
         select MTD_CFI_AMDSTD
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 0e7456ec99fd..3e51dd1da8aa 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -284,9 +284,6 @@ int jffs2_fill_scan_buf (struct jffs2_sb_info *c, void *buf,
                 D1(printk(KERN_WARNING "Read at 0x%x gave only 0x%zx bytes\n", ofs, retlen));
                 return -EIO;
         }
-        D2(printk(KERN_DEBUG "Read 0x%x bytes from 0x%08x into buf\n", len, ofs));
-        D2(printk(KERN_DEBUG "000: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                  buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], buf[14], buf[15]));
         return 0;
 }