summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-01 18:25:50 -0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-01 18:25:50 -0200
commit5c52a0f259af02c716ad064d752cb6efb1d29ec0 (patch)
treec5edfb1ddd296039033ec16f6292b46bfb561ed0 /drivers/staging
parent52eca34d5e354611e736430ccabb9de7da54d3e9 (diff)
parentb7eeec090c3067c359a3b60edd0c6fb14a71a93b (diff)
Merge branch 'build_fixes' into to_next
* build_fixes: uvc/lirc_serial: Fix some warnings on parisc arch rc: Fir warnings on m68k arch radio-si470x-i2c: fix a warning on ia64 cx18: disable compilation on frv arch platform drivers: Fix build on cris and frv archs iguanair: shut up a gcc warning on avr32 arch tef6862: fix warning on avr32 arch cx18: struct i2c_client is too big for stack zoran: don't build it on alpha radio-shark: remove a warning when CONFIG_PM is not defined tda9887: remove an warning when compiling for alpha
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/lirc/lirc_serial.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index af08e677b60f..7b3be2346b4b 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -707,7 +707,8 @@ static irqreturn_t irq_handler(int i, void *blah)
pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n",
dcd, sense,
tv.tv_sec, lasttv.tv_sec,
- tv.tv_usec, lasttv.tv_usec);
+ (unsigned long)tv.tv_usec,
+ (unsigned long)lasttv.tv_usec);
continue;
}
@@ -719,7 +720,8 @@ static irqreturn_t irq_handler(int i, void *blah)
pr_warn("%d %d %lx %lx %lx %lx\n",
dcd, sense,
tv.tv_sec, lasttv.tv_sec,
- tv.tv_usec, lasttv.tv_usec);
+ (unsigned long)tv.tv_usec,
+ (unsigned long)lasttv.tv_usec);
data = PULSE_MASK;
} else if (deltv > 15) {
data = PULSE_MASK; /* really long time */
@@ -728,7 +730,8 @@ static irqreturn_t irq_handler(int i, void *blah)
pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n",
dcd, sense,
tv.tv_sec, lasttv.tv_sec,
- tv.tv_usec, lasttv.tv_usec);
+ (unsigned long)tv.tv_usec,
+ (unsigned long)lasttv.tv_usec);
/*
* detecting pulse while this
* MUST be a space!