@@ -32,7 +32,7 @@
#include "tm6000.h"
#include "tm6000-regs.h"
#include "tuner-xc2028.h"
-#include "tuner-xc5000.h"
+#include "xc5000.h"
#define TM6000_BOARD_UNKNOWN 0
#define TM5600_BOARD_GENERIC 1
and apply to your new tree, you'll have just one change there.
A hunk starts with @@. the numbers after "-" are the line number and the number of lines
of the original code. The numbers after "+" are the line number/line count after the patch.
For example, on this hunk:
@@ -402,6 +448,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
}
#endif
}
+ return 0;
err2:
v4l2_device_unregister(&dev->v4l2_dev);
It is changing the content of line number 402 of the source code. The original code has 6 lines
(the 3 lines before and the 3 lines after the insertion). It is adding one line (the line with "+").
The resulting code will be at line #448 and will have 7 lines.
If you copy the above, plus the name of the file to patch (the lines with --- and +++):
@@ -402,6 +448,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
}
#endif
}
+ return 0;
err2:
v4l2_device_unregister(&dev->v4l2_dev);