This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
_cmm.h | ||
_deh.h | ||
_msg_sm.h | ||
_tiomap.h | ||
_tiomap_pwr.h | ||
chnl_sm.c | ||
dsp-clock.c | ||
io_sm.c | ||
msg_sm.c | ||
sync.c | ||
tiomap3430.c | ||
tiomap3430_pwr.c | ||
tiomap_io.c | ||
tiomap_io.h | ||
ue_deh.c | ||
wdt.c |