diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 14:39:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 14:39:33 -0400 |
commit | 35ad1c8803921b28541ad28bfb18dc3b6295ba98 (patch) | |
tree | 998468e8bd42fab02d09bae8fc74bdf546608580 /drivers/ide/pci/sis5513.c | |
parent | 580da34847488b404218d1d7f53b156f245f5555 (diff) | |
parent | f454cbe8cd38b6d447e74ddaf012017fea42717e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: ->cable_detect method cannot be marked __devinit
ide: ->quirkproc method cannot be marked __devinit
cs5520: add enablebits checking
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
ide-cd: fix endianity for the error message in cdrom_read_capacity
ide: remove CONFIG_IDE_MAX_HWIFS
remove unneeded #include <linux/ide.h>'s
ide: fix regression caused by ide_device_{get,put}() addition (take 2)
remove unnecessary <linux/hdreg.h> includes
ide: sanitize struct ide_port_ops documentation (take 2)
ide: fix ide_fix_driveid()
ide: fix pre-EIDE SWDMA support on big-endian
Diffstat (limited to 'drivers/ide/pci/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index cc95f90b53b7..e5a4b42b4e33 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -518,7 +518,7 @@ static const struct sis_laptop sis_laptop[] = { | |||
518 | { 0, } | 518 | { 0, } |
519 | }; | 519 | }; |
520 | 520 | ||
521 | static u8 __devinit sis_cable_detect(ide_hwif_t *hwif) | 521 | static u8 sis_cable_detect(ide_hwif_t *hwif) |
522 | { | 522 | { |
523 | struct pci_dev *pdev = to_pci_dev(hwif->dev); | 523 | struct pci_dev *pdev = to_pci_dev(hwif->dev); |
524 | const struct sis_laptop *lap = &sis_laptop[0]; | 524 | const struct sis_laptop *lap = &sis_laptop[0]; |