Hi all,
Here is a small patch that:
1) removes my name from the DONATIONS list in the README file: I haven't done
anything lately to justify my name in that list.
2) disables autoloading of modules that are also part of the kernel (i.e. not
a module but actually compiled into the kernel). The tuner or tveeprom are
examples of this. Trying to load a module when it is also compiled into the
kernel gives kobject_register errors.
Hans
diff -ur ivtv-0.3.6x-orig/README ivtv-0.3.6x/README
--- ivtv-0.3.6x-orig/README 2005-06-13 20:59:45.000000000 +0200
+++ ivtv-0.3.6x/README 2005-07-08 00:19:36.000000000 +0200
@@ -56,7 +56,3 @@
Chris Kennedy - http://www.ivtv.tv/DONATIONS.html
-
-Hans Verkuil - http://www.amazon.co.uk/exec/obidos/registry/21V4HXIFZ8G28/ref=wl_em_to
-
-
diff -ur ivtv-0.3.6x-orig/driver/ivtv-driver.c ivtv-0.3.6x/driver/ivtv-driver.c
--- ivtv-0.3.6x-orig/driver/ivtv-driver.c 2005-06-30 14:18:19.000000000 +0200
+++ ivtv-0.3.6x/driver/ivtv-driver.c 2005-07-08 00:20:09.000000000 +0200
@@ -988,8 +988,10 @@
case IVTV_CARD_PVR_150:
case IVTV_CARD_PVR_250:
case IVTV_CARD_PVR_350:
+#ifndef CONFIG_VIDEO_TVEEPROM
if (autoload)
ivtv_request_module("tveeprom");
+#endif
ivtv_read_eeprom(itv);
break;
default:
@@ -997,7 +999,9 @@
}
if (autoload) {
+#ifndef CONFIG_VIDEO_TUNER
ivtv_request_module("tuner");
+#endif
if (itv->card->type == IVTV_CARD_PVR_150 ||
itv->card->type == IVTV_CARD_PG600) {
ivtv_request_module("cx25840");
@@ -1012,10 +1016,14 @@
ivtv_request_module("saa7127");
}
if (itv->card->audio_selector == USE_MSP34XX) {
+#ifndef CONFIG_VIDEO_BT848
ivtv_request_module("msp3400");
+#endif
}
if (tda9887 >= 0) {
+#ifndef CONFIG_VIDEO_TUNER
ivtv_request_module("tda9887");
+#endif
}
}
