summaryrefslogtreecommitdiffstats
path: root/Documentation/feature-removal-schedule.txt
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-04 12:41:37 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-04 12:41:37 +0200
commitf9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch)
treef90b3031126c4e4beb8161f38ea436303e2b8b73 /Documentation/feature-removal-schedule.txt
parent[libata] Trim trailing whitespace. (diff)
parentLinux 2.6.18-rc6 (diff)
downloadlinux-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.tar.xz
linux-f9bcda7760e1373615c9f6d9ce24209b0ab97de1.zip
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
-rw-r--r--Documentation/feature-removal-schedule.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 87851efb0228..d1cd5f93e028 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -120,6 +120,13 @@ Who: Adrian Bunk <bunk@stusta.de>
---------------------------
+What: drivers depending on OSS_OBSOLETE_DRIVER
+When: options in 2.6.20, code in 2.6.22
+Why: OSS drivers with ALSA replacements
+Who: Adrian Bunk <bunk@stusta.de>
+
+---------------------------
+
What: pci_module_init(driver)
When: January 2007
Why: Is replaced by pci_register_driver(pci_driver).