---

yaml
---
r: 179747
b: refs/heads/master
c: a1ee06b
h: refs/heads/master
i:
  179745: 6a11051
  179743: 29b0de3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8be634e01b400fa2528848ad0cd6a5580a15bc4
+refs/heads/master: a1ee06b72968d80ab9362ec61143c4f090cc2d1b

trunk/arch/arm/mach-s3c6410/mach-hmt.c

@@ -82,7 +82,7 @@ static int hmt_bl_init(struct device *dev)
 	return ret;
 }
 
-static int hmt_bl_notify(struct device *dev, int brightness)
+static int hmt_bl_notify(int brightness)
 {
 	/*
 	 * translate from CIELUV/CIELAB L*->brightness, E.G. from

trunk/drivers/i2c/busses/i2c-imx.c

@@ -226,7 +226,6 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 		temp = readb(i2c_imx->base + IMX_I2C_I2CR);
 		temp &= ~(I2CR_MSTA | I2CR_MTX);
 		writeb(temp, i2c_imx->base + IMX_I2C_I2CR);
-		i2c_imx->stopped = 1;
 	}
 	if (cpu_is_mx1()) {
 		/*
@@ -236,8 +235,10 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 		udelay(i2c_imx->disable_delay);
 	}
 
-	if (!i2c_imx->stopped)
+	if (!i2c_imx->stopped) {
 		i2c_imx_bus_busy(i2c_imx, 0);
+		i2c_imx->stopped = 1;
+	}
 
 	/* Disable I2C controller */
 	writeb(0, i2c_imx->base + IMX_I2C_I2CR);

trunk/drivers/mtd/maps/Kconfig

@@ -549,21 +549,4 @@ config MTD_VMU
 	  To build this as a module select M here, the module will be called
 	  vmu-flash.
 
-config MTD_PISMO
-	tristate "MTD discovery driver for PISMO modules"
-	depends on I2C
-	depends on ARCH_VERSATILE
-	help
-	  This driver allows for discovery of PISMO modules - see
-	  <http://www.pismoworld.org/>.  These are small modules containing
-	  up to five memory devices (eg, SRAM, flash, DOC) described by an
-	  I2C EEPROM.
-
-	  This driver does not create any MTD maps itself; instead it
-	  creates MTD physmap and MTD SRAM platform devices.  If you
-	  enable this option, you should consider enabling MTD_PHYSMAP
-	  and/or MTD_PLATRAM according to the devices on your module.
-
-	  When built as a module, it will be called pismo.ko
-
 endmenu

trunk/drivers/mtd/mtdoops.c

@@ -322,7 +322,7 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
 	memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
 
 	/* Panics must be written immediately */
-	if (reason != KMSG_DUMP_OOPS) {
+	if (reason == KMSG_DUMP_PANIC) {
 		if (!cxt->mtd->panic_write)
 			printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
 		else