Merge willy/hch fixes

diff --cc drivers/scsi/sym53c8xx_2/sym_glue.c
index a5a2a0c22194f8550ba2e888b5e99513a24ef705,bd3ca5ee0525fa647ea98deaf3887651eeb93afc..26dcbea2b562ded8062e28e456e0ccef5df96c09
--- 1/drivers/scsi/sym53c8xx_2/sym_glue.c
--- 2/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@@ -2214,13 -2154,10 +2155,10 @@@ __setup("sym53c8xx=", sym53c8xx_setup)
   *  boards and save data for attaching after all boards have 
   *  been detected.
   */
 -static int __init
 +static int __devinit
  sym53c8xx_pci_init(struct pci_dev *pdev, sym_device *device)
  {
-       u_short vendor_id, device_id, command, status_reg;
-       u_char cache_line_size;
-       u_char suggested_cache_line_size = 0;
-       u_char pci_fix_up = SYM_SETUP_PCI_FIX_UP;
+       u_short vendor_id, device_id, status_reg;
        u_char revision;
        u_int irq;
        u_long base, base_2;