(cherry picked from commit 42b8a557d6f0045c2a3a06a9ff457ce2a9cf7144)

Conflicts:

	modules/access/dtv/linux.c