summaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/ev64260.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-23 17:13:43 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-23 17:13:43 -0500
commit88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch)
treeab518773c0ff4606f1a57d00b5931332a7e1d96e /arch/ppc/platforms/ev64260.c
parentfa4fa40a990f8f4eff65476bef32007c154bbac0 (diff)
parentb0e6e962992b76580f4900b166a337bad7c1e81b (diff)
downloadop-kernel-dev-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.zip
op-kernel-dev-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.tar.gz
Merge branch 'master'
Diffstat (limited to 'arch/ppc/platforms/ev64260.c')
-rw-r--r--arch/ppc/platforms/ev64260.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index ffde8f6..31e8e21 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -1,6 +1,4 @@
/*
- * arch/ppc/platforms/ev64260.c
- *
* Board setup routines for the Marvell/Galileo EV-64260-BP Evaluation Board.
*
* Author: Mark A. Greer <mgreer@mvista.com>
@@ -416,7 +414,7 @@ ev64260_fixup_mpsc_pdata(struct platform_device *pdev)
return;
}
-static int __init
+static int
ev64260_platform_notify(struct device *dev)
{
static struct {
OpenPOWER on IntegriCloud