summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/diskonchip.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
committerLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
commit292dd876ee765c478b27c93cc51e93a558ed58bf (patch)
tree5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/mtd/nand/diskonchip.c
parent[ACPI] remove "Resource isn't an IRQ" warning (diff)
parent[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff)
downloadlinux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz
linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip
Pull release into acpica branch
Diffstat (limited to 'drivers/mtd/nand/diskonchip.c')
-rw-r--r--drivers/mtd/nand/diskonchip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 21d4e8f4b7af..ec5e45e4e4ef 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1506,7 +1506,7 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd)
return 1;
}
-static inline int __init doc_probe(unsigned long physadr)
+static int __init doc_probe(unsigned long physadr)
{
unsigned char ChipID;
struct mtd_info *mtd;