Commit 35168d7a authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/linux-2.6 into pobox.com:/garz/repo/misc-2.6

parents 6695ad97 95bbe328
......@@ -3460,15 +3460,15 @@ static int i810_pm_resume(struct pci_dev *dev)
}
#endif /* CONFIG_PM */
MODULE_AUTHOR("");
MODULE_AUTHOR("The Linux kernel team");
MODULE_DESCRIPTION("Intel 810 audio support");
MODULE_LICENSE("GPL");
MODULE_PARM(ftsodell, "i");
MODULE_PARM(clocking, "i");
MODULE_PARM(strict_clocking, "i");
MODULE_PARM(spdif_locked, "i");
module_param(ftsodell, int, 0444);
module_param(clocking, uint, 0444);
module_param(strict_clocking, int, 0444);
module_param(spdif_locked, int, 0444);
#define I810_MODULE_NAME "intel810_audio"
#define I810_MODULE_NAME "i810_audio"
static struct pci_driver i810_pci_driver = {
.name = I810_MODULE_NAME,
......
......@@ -535,8 +535,8 @@ static const struct {
static int dmabuf;
static int dmabug;
MODULE_PARM(dmabuf, "i");
MODULE_PARM(dmabug, "i");
module_param(dmabuf, int, 0444);
module_param(dmabug, int, 0444);
static int __init oss_init(void)
{
......
......@@ -430,11 +430,11 @@ EXPORT_SYMBOL(uart401intr);
static struct address_info cfg_mpu;
static int __initdata io = -1;
static int __initdata irq = -1;
static int io = -1;
static int irq = -1;
MODULE_PARM(io, "i");
MODULE_PARM(irq, "i");
module_param(io, int, 0444);
module_param(irq, int, 0444);
static int __init init_uart401(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment