git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
[pandora-kernel.git]
/
drivers
/
scsi
/
hptiop.c
diff --git
a/drivers/scsi/hptiop.c
b/drivers/scsi/hptiop.c
index
138e573
..
ee196b3
100644
(file)
--- a/
drivers/scsi/hptiop.c
+++ b/
drivers/scsi/hptiop.c
@@
-1282,8
+1282,7
@@
static int hptiop_internal_memfree_mvfrey(struct hptiop_hba *hba)
return -1;
}
-static int __devinit hptiop_probe(struct pci_dev *pcidev,
- const struct pci_device_id *id)
+static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
{
struct Scsi_Host *host = NULL;
struct hptiop_hba *hba;