diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /drivers/media/tuners/e4000.h | |
| parent | clocksource: vf_pit_timer: Switch to sched_clock_register() (diff) | |
| parent | Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (diff) | |
| download | linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.tar.xz linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.zip | |
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/media/tuners/e4000.h')
| -rw-r--r-- | drivers/media/tuners/e4000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/tuners/e4000.h b/drivers/media/tuners/e4000.h index 3783a0bdf855..25ee7c07abff 100644 --- a/drivers/media/tuners/e4000.h +++ b/drivers/media/tuners/e4000.h @@ -44,7 +44,7 @@ extern struct dvb_frontend *e4000_attach(struct dvb_frontend *fe, static inline struct dvb_frontend *e4000_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct e4000_config *cfg) { - pr_warn("%s: driver disabled by Kconfig\n", __func__); + dev_warn(&i2c->dev, "%s: driver disabled by Kconfig\n", __func__); return NULL; } #endif |