summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2008-03-29nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNPBjorn Helgaas
Wrap PNP probe code in #ifdef CONFIG_PNP. Without this change, we'll have unresolved references to pnp_get_resource() function when CONFIG_PNP=n. (This is a new interface that's not in mainline yet.) Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
2008-03-29smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNPBjorn Helgaas
Wrap PNP probe code in #ifdef CONFIG_PNP. Without this change, we'll have unresolved references to pnp_get_resource() function when CONFIG_PNP=n. (This is a new interface that's not in mainline yet.) Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
2008-03-29parport_pc: wrap PNP probe code in #ifdef CONFIG_PNPBjorn Helgaas
Wrap PNP probe code in #ifdef CONFIG_PNP. We already do the same for CONFIG_PCI. Without this change, we'll have unresolved references to pnp_get_resource() function when CONFIG_PNP=n. (This is a new interface that's not in mainline yet.) Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
2008-03-29Merge branch 'quilt/ldp'Stephen Rothwell
2008-03-29Merge commit 'semaphore/semaphore'Stephen Rothwell
2008-03-29Merge commit 'mtd/master'Stephen Rothwell
2008-03-29Merge commit 'net/master'Stephen Rothwell
Conflicts: MAINTAINERS
2008-03-29Merge commit 'async_tx/next'Stephen Rothwell
2008-03-29Merge commit '4xx/next'Stephen Rothwell
2008-03-29Merge commit 'powerpc/powerpc-next'Stephen Rothwell
2008-03-29Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-03-29Revert "driver core: remove no longer used "struct class_device""Stephen Rothwell
This reverts commit bb93e53747f52bff540b26b5af19713ddba68f6f.
2008-03-29Merge commit 'scsi/master'Stephen Rothwell
2008-03-29Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
Conflicts: drivers/scsi/scsi_sysfs.c
2008-03-29Merge commit 'kvm/master'Stephen Rothwell
Conflicts: include/asm-s390/sysinfo.h
2008-03-29Merge commit 'ubi/master'Stephen Rothwell
2008-03-29Merge commit 'hwmon/testing'Stephen Rothwell
2008-03-29Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-03-29Merge commit 'acpi/test'Stephen Rothwell
2008-03-29Merge commit 'infiniband/for-next'Stephen Rothwell
Conflicts: drivers/infiniband/hw/amso1100/c2_provider.c drivers/infiniband/hw/cxgb3/iwch_provider.c drivers/infiniband/hw/nes/nes_verbs.c
2008-03-29Merge commit 'libata/NEXT'Stephen Rothwell
2008-03-29Merge branch 'quilt/ide'Stephen Rothwell
Conflicts: Documentation/ide/ide.txt Documentation/kernel-parameters.txt drivers/ide/ide.c
2008-03-29Merge commit 'sh/master'Stephen Rothwell
2008-03-29Merge commit 's390/features'Stephen Rothwell
2008-03-29Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-03-29Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-03-29Merge branch 'quilt/i2c'Stephen Rothwell
2008-03-29Merge commit 'hid/mm'Stephen Rothwell
2008-03-29Merge branch 'quilt/usb'Stephen Rothwell
2008-03-29Merge branch 'quilt/pci'Stephen Rothwell
2008-03-29Merge branch 'quilt/driver-core'Stephen Rothwell
2008-03-29add me4000 pci data collection driverGreg Kroah-Hartman
Originally written by Guenter Gebhardt <g.gebhardt@meilhaus.de> Lots of work are needed to get this into merging shape... Cc: Wolfgang Beiter <w.beiter@aon.at> Cc: Guenter Gebhardt <g.gebhardt@meilhaus.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-03-29Input: add appleir driverGreg Kroah-Hartman
This driver was originally written by James McKenzie but forward ported and cleaned up by me to get it to work with modern kernel versions. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-03-29NET: add Alacritech slicoss driverGreg Kroah-Hartman
This adds the Alacritech slicoss driver to the tree. This driver is supposed to support: Mojave cards (single port PCI Gigabit) both copper and fiber Oasis cards (single and dual port PCI-x Gigabit) copper and fiber Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber The driver was acutally tested on Oasis and Kalahari cards. Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-03-29Video: add the go7007 driverGreg Kroah-Hartman
Doesn't build yet, but we have to start somewhere...
2008-03-29DVB: add firesat driverGreg Kroah-Hartman
Original code written by Christian Dolzer <c.dolzer@digital-everywhere.com> Cleaned up by Greg. Cc: Christian Dolzer <c.dolzer@digital-everywhere.com> Cc: Andreas Monitzer <andy@monitzer.com> Cc: Manu Abraham <manu@linuxtv.org> Cc: Fabio De Lorenzo <delorenzo.fabio@gmail.com> Cc: Robert Berger <robert.berger@reliableembeddedsystems.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-03-29USB: add Sensoray 2255 v4l driverGreg Kroah-Hartman
This driver is still very rough, but included here while it is being worked on so I catch any api changes and it will show up in linux-next and -mm for people to start using. It will not end up in the drivers/usb/image/ directory, it's just there for me to be able to play with it easier for now. Cc: Dean Anderson <dean@sensoray.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-03-29ide: make ide_hwifs[] staticBartlomiej Zolnierkiewicz
Move ide_hwifs[] from ide.c to ide-probe.c and make it static. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: fix hwif-s initializationBartlomiej Zolnierkiewicz
* Add ide_hwifs[] entry initialization to ide_find_port_slot() and remove ide_init_port_data() calls from host drivers. * Unexport ide_init_port_data(). * Remove no longer needed init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: make ide_unregister() take 'ide_hwif_t *' as an argumentBartlomiej Zolnierkiewicz
* Make ide_unregister() take 'ide_hwif_t *hwif' instead of 'unsigned int index' (hwif->index) as an argument and update all users accordingly. While at it: * Remove unnecessary checks for hwif != NULL from ide-pnp.c::idepnp_remove() and delkin_cb.c::delkin_cb_remove(). * Remove needless hwif->chipset assignment from scc_pata.c::scc_remove(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: sanitize ide_unregister() usageBartlomiej Zolnierkiewicz
* Remove ide_unregister() call from ide_exit() (host drivers take care of unregistering hwif-s themselves). * Remove ide_unregister() call from probe methods of bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers (ide_find_port() returns only free ide_hwifs[] entries). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29mpc8xx-ide: use ide_find_port()Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: remove obsoleted "ide=" kernel parametersBartlomiej Zolnierkiewicz
* Remove obsoleted "ide=" kernel parameters. * Remove no longer needed: - ide_setup() - parse_options() - __setup("", ...) - module_param(options, ...) * Use module_{init,exit}() for MODULE=y case and remove MODULE ifdef. * Make ide_*acpi* and ide_doubler variables static. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: add "noacpi" / "acpigtf" / "acpionboot" parametersBartlomiej Zolnierkiewicz
* Rename ide_noacpi{tfs,onboot} to ide_acpi{gtf,onboot} (+ reverse logic). * Move ide_*acpi* variables to ide-acpi.c and remove unnecessary initializers. * Add "noacpi" / "acpigtf" / "acpionboot" parameters. * Obsolete "ide=noacpi" / "ide=acpigtf" / "ide=acpionboot" kernel parameters. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29gayle: add "doubler" parameterBartlomiej Zolnierkiewicz
* Add "doubler" parameter to enable support for IDE doublers. * Obsolete "ide=doubler" kernel parameter. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: cleanup init_ide_data()Bartlomiej Zolnierkiewicz
* Remove no longer need init_ide_data() call from ide_setup(). * Cleanup init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: remove obsoleted "hdx=" kernel parametersBartlomiej Zolnierkiewicz
* Remove obsoleted "hdx=" kernel parameters. * Remove no longer used stridx() and match_parm(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: add "cdrom=" and "chs=" parametersBartlomiej Zolnierkiewicz
* Add "cdrom=" and "chs=" parameters. * Obsolete "hdx=cdrom" and "hdx=cyls,heads,sects" kernel parameters. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: add "nodma|noflush|noprobe|nowerr=" parametersBartlomiej Zolnierkiewicz
* Add "nodma|noflush|noprobe|nowerr=" parameters. * Obsolete "hdx=noprobe|none|nowerr|nodma|noflush" kernel parameters. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-29ide: remove obsoleted "hdx=autotune" kernel parameterBartlomiej Zolnierkiewicz
* Remove obsoleted "hdx=autotune" kernel parameter (we always auto-tune PIO if possible nowadays). * Remove no longer needed ide_drive_t.autotune flag. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>