diff --git a/[refs] b/[refs] index c2d1835b74b7..f223498eeafa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 575f552012ec0cd6591fd85ee996d5a5ad1a669a +refs/heads/master: d4a3895f5d024b47ef8e9d98c59a9b86dcdcef59 diff --git a/trunk/drivers/block/cpqarray.c b/trunk/drivers/block/cpqarray.c index 91d11631cec9..95ae5b98c271 100644 --- a/trunk/drivers/block/cpqarray.c +++ b/trunk/drivers/block/cpqarray.c @@ -503,7 +503,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev) return -1; } -static int __init cpqarray_init_one( struct pci_dev *pdev, +static int __devinit cpqarray_init_one( struct pci_dev *pdev, const struct pci_device_id *ent) { int i;