Commit 41a0db27 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] amd74xx: fix for !CONFIG_PROCFS

From: "Randy.Dunlap" <rddunlap@osdl.org>
From: Luiz Fernando Capitulino <lcapitulino@prefeitura.sp.gov.br>

this patch fixes this warning:

drivers/ide/pci/amd74xx.c:80: warning: `amd_udma2cyc' defined
but not used

when !CONFIG_PROC_FS.
parent 793502bf
...@@ -76,9 +76,8 @@ static ide_pci_device_t *amd_chipset; ...@@ -76,9 +76,8 @@ static ide_pci_device_t *amd_chipset;
static unsigned int amd_80w; static unsigned int amd_80w;
static unsigned int amd_clock; static unsigned int amd_clock;
static unsigned char amd_cyc2udma[] = { 6, 6, 5, 4, 0, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 7 };
static unsigned char amd_udma2cyc[] = { 4, 6, 8, 10, 3, 2, 1, 15 };
static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" }; static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" };
static unsigned char amd_cyc2udma[] = { 6, 6, 5, 4, 0, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 7 };
/* /*
* AMD /proc entry. * AMD /proc entry.
...@@ -89,6 +88,7 @@ static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" } ...@@ -89,6 +88,7 @@ static char *amd_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" }
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
static unsigned char amd_udma2cyc[] = { 4, 6, 8, 10, 3, 2, 1, 15 };
static unsigned long amd_base; static unsigned long amd_base;
static struct pci_dev *bmide_dev; static struct pci_dev *bmide_dev;
extern int (*amd74xx_display_info)(char *, char **, off_t, int); /* ide-proc.c */ extern int (*amd74xx_display_info)(char *, char **, off_t, int); /* ide-proc.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment