The patch titled
the scheduled removal of drivers/ieee1394/sbp2.c:force_inquiry_hack
has been removed from the -mm tree. Its filename is
the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: the scheduled removal of drivers/ieee1394/sbp2.c:force_inquiry_hack
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch contains the scheduled removal of the force_inquiry_hack module
parameter.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
Documentation/feature-removal-schedule.txt | 9 ---------
drivers/ieee1394/sbp2.c | 10 ----------
2 files changed, 19 deletions(-)
diff -puN Documentation/feature-removal-schedule.txt~the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack Documentation/feature-removal-schedule.txt
--- a/Documentation/feature-removal-schedule.txt~the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack
+++ a/Documentation/feature-removal-schedule.txt
@@ -46,15 +46,6 @@ Who: Jody McIntyre <scjody@xxxxxxxxxxxxx
---------------------------
-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: December 2006
Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
diff -puN drivers/ieee1394/sbp2.c~the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.c~the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack
+++ a/drivers/ieee1394/sbp2.c
@@ -173,11 +173,6 @@ MODULE_PARM_DESC(workarounds, "Work arou
", 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 @@ static void sbp2_parse_unit_directory(st
}
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++) {
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
git-alsa.patch
git-cpufreq.patch
git-drm.patch
git-dvb.patch
git-gfs2.patch
git-ieee1394.patch
git-input.patch
2-of-2-jmicron-driver-plumbing-and-quirk-cleanup.patch
git-mtd.patch
git-netdev-all.patch
git-net.patch
fs-nfs-make-code-static.patch
git-ocfs2.patch
git-pcmcia.patch
drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch
git-scsi-misc.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
selinux-enable-configuration-of-max-policy-version-improve-security_selinux_policydb_version_max_value-help-texts.patch
avr32-set-kbuild_defconfig.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
drivers-char-scx200_gpioc-make-code-static.patch
drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch
fix-conflict-with-the-is_init-identifier-on-parisc.patch
cpuset-top_cpuset-tracks-hotplug-changes-to-node_online_map-fix-2.patch
build-sound-sound_firmwarec-only-for-oss.patch
kernel-time-ntpc-possible-cleanups.patch
generic-ioremap_page_range-implementation-fix.patch
generic-ioremap_page_range-i386-conversion-fix.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-implement-clone_newuts-flag.patch
rename-the-provided-execve-functions-to-kernel_execve-fixes.patch
provide-kernel_execve-on-all-architectures-m68knommu-fix.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
drivers-ide-cleanups.patch
atyfb-possible-cleanups.patch
fbcon-make-3-functions-static.patch
vt-proper-prototypes-for-some-console-functions.patch
md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
rcu-add-fake-writers-to-rcutorture-tidy.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
