From b5d425c97f7d4e92151167b01ca038e7853c6b37 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 15 Jul 2007 23:39:01 -0700 Subject: more scheduled OSS driver removal This patch contains the scheduled removal of OSS drivers that: - have ALSA drivers for the same hardware without known regressions and - whose Kconfig options have been removed in 2.6.20. Signed-off-by: Adrian Bunk Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- sound/oss/adlib_card.c | 73 -------------------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 sound/oss/adlib_card.c (limited to 'sound/oss/adlib_card.c') diff --git a/sound/oss/adlib_card.c b/sound/oss/adlib_card.c deleted file mode 100644 index c9a7c9b470de..000000000000 --- a/sound/oss/adlib_card.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * sound/oss/adlib_card.c - * - * Detection routine for the AdLib card. - * - * Copyright (C) by Hannu Savolainen 1993-1997 - * - * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) - * Version 2 (June 1991). See the "COPYING" file distributed with this software - * for more info. - */ - -#include -#include - -#include "sound_config.h" - -#include "opl3.h" - -static void __init attach_adlib_card(struct address_info *hw_config) -{ - hw_config->slots[0] = opl3_init(hw_config->io_base, hw_config->osp, THIS_MODULE); -} - -static int __init probe_adlib(struct address_info *hw_config) -{ - return opl3_detect(hw_config->io_base, hw_config->osp); -} - -static struct address_info cfg; - -static int __initdata io = -1; - -module_param(io, int, 0); - -static int __init init_adlib(void) -{ - cfg.io_base = io; - - if (cfg.io_base == -1) { - printk(KERN_ERR "adlib: must specify I/O address.\n"); - return -EINVAL; - } - if (probe_adlib(&cfg) == 0) - return -ENODEV; - attach_adlib_card(&cfg); - - return 0; -} - -static void __exit cleanup_adlib(void) -{ - sound_unload_synthdev(cfg.slots[0]); - -} - -module_init(init_adlib); -module_exit(cleanup_adlib); - -#ifndef MODULE -static int __init setup_adlib(char *str) -{ - /* io */ - int ints[2]; - str = get_options(str, ARRAY_SIZE(ints), ints); - - io = ints[1]; - - return 1; -} -__setup("adlib=", setup_adlib); -#endif -MODULE_LICENSE("GPL"); -- cgit v1.2.2