summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-03 14:12:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-03 14:12:41 -0800
commitf41bf2ab998daaa2ac27348d5813e0ae21c57ded (patch)
tree0ad5ca31ec88b84c4ba1f6380bd971d9933f33e5 /drivers/mtd
parent2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff)
parentbdf602bd737eb07d63d6fa2da826b4751fdf9bab (diff)
downloadop-kernel-dev-f41bf2ab998daaa2ac27348d5813e0ae21c57ded.zip
op-kernel-dev-f41bf2ab998daaa2ac27348d5813e0ae21c57ded.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] fix lots of ARM __devexit sillyness [ARM] 5417/1: Set the correct cacheid for ARMv6 CPUs with ARMv7 style MMU [ARM] 5416/1: Use unused address in v6_early_abort [ARM] 5411/1: S3C64XX: Fix EINT unmask [ARM] at91: fix for Atmel AT91 powersaving [ARM] RiscPC: Fix etherh oops
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/orion_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 917cf8d..c2dfd3e 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -149,7 +149,7 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
static struct platform_driver orion_nand_driver = {
.probe = orion_nand_probe,
- .remove = orion_nand_remove,
+ .remove = __devexit_p(orion_nand_remove),
.driver = {
.name = "orion_nand",
.owner = THIS_MODULE,
OpenPOWER on IntegriCloud