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 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
[pandora-kernel.git]
/
drivers
/
scsi
/
advansys.c
diff --git
a/drivers/scsi/advansys.c
b/drivers/scsi/advansys.c
index
f4cfb8f
..
dd9fb3d
100644
(file)
--- a/
drivers/scsi/advansys.c
+++ b/
drivers/scsi/advansys.c
@@
-114,7
+114,7
@@
#include "advansys.h"
#endif
#include "advansys.h"
#endif
- and after "static
Scsi_Host_T
emplate builtin_scsi_hosts[] =":
+ and after "static
struct scsi_host_t
emplate builtin_scsi_hosts[] =":
#ifdef CONFIG_SCSI_ADVANSYS
ADVANSYS,
#ifdef CONFIG_SCSI_ADVANSYS
ADVANSYS,
@@
-160,7
+160,7
@@
--- Driver Structures
--- Driver Data
--- Driver Function Prototypes
--- Driver Structures
--- Driver Data
--- Driver Function Prototypes
- --- Linux '
Scsi_Host_T
emplate' and advansys_setup() Functions
+ --- Linux '
struct scsi_host_t
emplate' and advansys_setup() Functions
--- Loadable Driver Support
--- Miscellaneous Driver Functions
--- Functions Required by the Asc Library
--- Loadable Driver Support
--- Miscellaneous Driver Functions
--- Functions Required by the Asc Library
@@
-2051,7
+2051,7
@@
STATIC ASC_DCNT AscGetMaxDmaCount(ushort);
#define ADV_VADDR_TO_U32 virt_to_bus
#define ADV_U32_TO_VADDR bus_to_virt
#define ADV_VADDR_TO_U32 virt_to_bus
#define ADV_U32_TO_VADDR bus_to_virt
-#define AdvPortAddr
ulong
/* Virtual memory address size */
+#define AdvPortAddr
void __iomem *
/* Virtual memory address size */
/*
* Define Adv Library required memory access macros.
/*
* Define Adv Library required memory access macros.
@@
-4068,7
+4068,7
@@
STATIC void asc_prt_hex(char *f, uchar *, int);
/*
/*
- * --- Linux '
Scsi_Host_T
emplate' and advansys_setup() Functions
+ * --- Linux '
struct scsi_host_t
emplate' and advansys_setup() Functions
*/
#ifdef CONFIG_PROC_FS
*/
#ifdef CONFIG_PROC_FS
@@
-12374,7
+12374,7
@@
AscInitFromEEP(ASC_DVC_VAR *asc_dvc)
ASC_PRINT1(
"AscInitFromEEP: Failed to re-write EEPROM with %d errors.\n", i);
} else {
ASC_PRINT1(
"AscInitFromEEP: Failed to re-write EEPROM with %d errors.\n", i);
} else {
- ASC_PRINT("AscInitFromEEP: Succes
fully re-wrote EEPROM.
");
+ ASC_PRINT("AscInitFromEEP: Succes
sfully re-wrote EEPROM.\n
");
}
}
return (warn_code);
}
}
return (warn_code);
@@
-17316,7
+17316,7
@@
AdvWaitEEPCmd(AdvPortAddr iop_base)
/*
* Write the EEPROM from 'cfg_buf'.
*/
/*
* Write the EEPROM from 'cfg_buf'.
*/
-void
+void
__init
AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)
{
ushort *wbuf;
AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)
{
ushort *wbuf;
@@
-17383,7
+17383,7
@@
AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)
/*
* Write the EEPROM from 'cfg_buf'.
*/
/*
* Write the EEPROM from 'cfg_buf'.
*/
-void
+void
__init
AdvSet38C0800EEPConfig(AdvPortAddr iop_base,
ADVEEP_38C0800_CONFIG *cfg_buf)
{
AdvSet38C0800EEPConfig(AdvPortAddr iop_base,
ADVEEP_38C0800_CONFIG *cfg_buf)
{
@@
-17451,7
+17451,7
@@
AdvSet38C0800EEPConfig(AdvPortAddr iop_base,
/*
* Write the EEPROM from 'cfg_buf'.
*/
/*
* Write the EEPROM from 'cfg_buf'.
*/
-void
+void
__init
AdvSet38C1600EEPConfig(AdvPortAddr iop_base,
ADVEEP_38C1600_CONFIG *cfg_buf)
{
AdvSet38C1600EEPConfig(AdvPortAddr iop_base,
ADVEEP_38C1600_CONFIG *cfg_buf)
{