diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-19 15:40:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-19 15:40:18 -0700 |
| commit | 068a565afad3ae818cc0d5495479c4abccc7762c (patch) | |
| tree | 4243dbfa3250cc4da757b3fbc03462267e4e2426 /drivers/scsi | |
| parent | b55a7a5fbf09ea59777c3b41b6f5cb1ae81aa2bb (diff) | |
| parent | 5276b6877efb8a180e254a06d7497f802f6f9755 (diff) | |
| download | blackbird-op-linux-068a565afad3ae818cc0d5495479c4abccc7762c.tar.gz blackbird-op-linux-068a565afad3ae818cc0d5495479c4abccc7762c.zip | |
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
A collection of warning fixes on non-ARM code from Arnd Bergmann:
* 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: s3c: mark s3c2440_clk_add as __init_refok
spi/s3c64xx: use correct dma_transfer_direction type
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
SCSI: ARM: make fas216_dumpinfo function conditional
SCSI: ARM: ncr5380/oak uses no interrupts
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/arm/fas216.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/arm/oak.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c index 6206a666a8ec..737554c37d9e 100644 --- a/drivers/scsi/arm/fas216.c +++ b/drivers/scsi/arm/fas216.c @@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char * SCp->buffers_residual, suffix); } +#ifdef CHECK_STRUCTURE static void fas216_dumpinfo(FAS216_Info *info) { static int used = 0; @@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info) info->internal_done, info->magic_end); } -#ifdef CHECK_STRUCTURE static void __fas216_checkmagic(FAS216_Info *info, const char *func) { int corruption = 0; diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index d25f944b59c2..fc6a5aabf66e 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c @@ -21,6 +21,7 @@ /*#define PSEUDO_DMA*/ #define OAKSCSI_PUBLIC_RELEASE 1 +#define DONT_USE_INTR #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) #define NCR5380_local_declare() void __iomem *_base |
