Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] ARC: Fix several compiler warnings.
  [MIPS] ISA: Fix typo
  [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.

3 files changed, 10 insertions, 7 deletions

diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index 0ac8f42d3752..e2f75b13312f 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -23,16 +23,16 @@ LONG *_prom_argv, *_prom_envp;
 void __init prom_init(void)
 {
         PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
+
         romvec = ROMVECTOR;
-        ULONG cnt;
-        CHAR c;
 
         prom_argc = fw_arg0;
         _prom_argv = (LONG *) fw_arg1;
         _prom_envp = (LONG *) fw_arg2;
 
         if (pb->magic != 0x53435241) {
-                printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic);
+                printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n",
+                       (unsigned long) pb->magic);
                 while(1)
                         ;
         }
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
index 6d58b0370802..59146e3365ba 100644
--- a/drivers/char/ds1286.c
+++ b/drivers/char/ds1286.c
@@ -197,6 +197,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
 
                 hrs = alm_tm.tm_hour;
                 min = alm_tm.tm_min;
+                sec = alm_tm.tm_sec;
 
                 if (hrs >= 24)
                         hrs = 0xff;
@@ -204,9 +205,11 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
                 if (min >= 60)
                         min = 0xff;
 
-                BIN_TO_BCD(sec);
-                BIN_TO_BCD(min);
-                BIN_TO_BCD(hrs);
+                if (sec != 0)
+                        return -EINVAL;
+
+                min = BIN2BCD(min);
+                min = BIN2BCD(hrs);
 
                 spin_lock(&ds1286_lock);
                 rtc_write(hrs, RTC_HOURS_ALARM);
diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h
index e06ef0776d48..833437d31ef1 100644
--- a/include/asm-mips/dma.h
+++ b/include/asm-mips/dma.h
@@ -74,7 +74,7 @@
  *
  */
 
-#ifndef GENERIC_ISA_DMA_SUPPORT_BROKEN
+#ifndef CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN
 #define MAX_DMA_CHANNELS        8
 #endif