This patch contains the scheduled removal of the force_inquiry_hack module parameter.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
---
Documentation/feature-removal-schedule.txt | 9 ---------
drivers/ieee1394/sbp2.c | 10 ----------
2 files changed, 19 deletions(-)
--- linux-2.6.18-rc2-mm1-full/Documentation/feature-removal-schedule.txt.old 2006-07-27 20:36:51.000000000 +0200
+++ linux-2.6.18-rc2-mm1-full/Documentation/feature-removal-schedule.txt 2006-07-27 20:37:00.000000000 +0200
@@ -23,15 +23,6 @@
---------------------------
-What: sbp2: module parameter "force_inquiry_hack"
-When: July 2006
-Why: Superceded by parameter "workarounds". Both parameters are meant to be
- used ad-hoc and for single devices only, i.e. not in modprobe.conf,
- therefore the impact of this feature replacement should be low.
-Who: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
-
----------------------------
-
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
When: July 2006
Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
--- linux-2.6.18-rc2-mm1-full/drivers/ieee1394/sbp2.c.old 2006-07-27 20:37:10.000000000 +0200
+++ linux-2.6.18-rc2-mm1-full/drivers/ieee1394/sbp2.c 2006-07-27 20:37:23.000000000 +0200
@@ -173,11 +173,6 @@
", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
", or a combination)");
-/* legacy parameter */
-static int force_inquiry_hack;
-module_param(force_inquiry_hack, int, 0644);
-MODULE_PARM_DESC(force_inquiry_hack, "Deprecated, use 'workarounds'");
-
/*
* Export information about protocols/devices supported by this driver.
*/
@@ -1554,11 +1549,6 @@
}
workarounds = sbp2_default_workarounds;
- if (force_inquiry_hack) {
- SBP2_WARN("force_inquiry_hack is deprecated. "
- "Use parameter 'workarounds' instead.");
- workarounds |= SBP2_WORKAROUND_INQUIRY_36;
- }
if (!(workarounds & SBP2_WORKAROUND_OVERRIDE))
for (i = 0; i < ARRAY_SIZE(sbp2_workarounds_table); i++) {