aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-12-07 20:17:35 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-12-07 20:17:35 -0800
commitf4f9cbd90bd1f816d35e2529e6a6f397de2f867b (patch)
treec4680bb8bbd2ace1a0102252ef623161b9c9792e /pci
parenta74052d41191f6bfd8af50f2327e53ce10884074 (diff)
parentefc7ab83a7a3cfea941f0e97db832d12e123cd54 (diff)
downloadpatches-f4f9cbd90bd1f816d35e2529e6a6f397de2f867b.tar.gz
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Diffstat (limited to 'pci')
-rw-r--r--pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
index 3fa1cb0794056..9af2fed30f9a0 100644
--- a/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
+++ b/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
@@ -6,7 +6,8 @@ Subject: drivers/sound/oss: Replace pci_module_init() with pci_register_driver()
Replace obsolete pci_module_init() with pci_register_driver().
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-Cc: Richard Knutsson <ricknu-0@student.ltu.se>
+Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
+
---
sound/oss/ad1889.c | 2 +-
sound/oss/btaudio.c | 2 +-