7cbc3013f6
Fix a trivial conflict, where the location of DVB headers got moved. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
||
---|---|---|
.. | ||
cxd2880-spi.c | ||
gs1662.c | ||
Kconfig | ||
Makefile |
7cbc3013f6
Fix a trivial conflict, where the location of DVB headers got moved. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
||
---|---|---|
.. | ||
cxd2880-spi.c | ||
gs1662.c | ||
Kconfig | ||
Makefile |