From 7b03b4d2b64ca2cfe9d8950147e662928f01a942 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 26 Jul 2007 13:52:28 -0500 Subject: [PATCH] --- yaml --- r: 67487 b: refs/heads/master c: 2d2294ae12827a97c9daa253f1ce99e7ae3195d7 h: refs/heads/master i: 67485: 7e118c9d2b38495b2678071cafad3f0f3db9fac0 67483: caf87bb49010f4379aca7d9827bd4a2729624ed2 67479: f8e686f1535b196f57b6ff796b128fe76a0d9d4f 67471: 4734c75c7ab408f639aab9b84fb60474b89c5ab1 67455: 793719d8d0a5b54f17c6c8bbd7844104a3bf2a18 v: v3 --- [refs] | 2 +- .../arch/powerpc/platforms/82xx/mpc8272_ads.c | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index f8212a44659d..5b9f175512bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1df447197b11e70d451786be8aebf2f8606754e +refs/heads/master: 2d2294ae12827a97c9daa253f1ce99e7ae3195d7 diff --git a/trunk/arch/powerpc/platforms/82xx/mpc8272_ads.c b/trunk/arch/powerpc/platforms/82xx/mpc8272_ads.c index 5f538d5e7fdb..4de76dad31b2 100644 --- a/trunk/arch/powerpc/platforms/82xx/mpc8272_ads.c +++ b/trunk/arch/powerpc/platforms/82xx/mpc8272_ads.c @@ -1,5 +1,5 @@ /* - * MPC82xx_ads setup and early boot code plus other random bits. + * MPC8272_ads setup and early boot code plus other random bits. * * Author: Vitaly Bordug * m82xx_restart fix by Wade Farnsworth @@ -63,7 +63,7 @@ static unsigned long pci_int_base; static struct irq_host *pci_pic_host; #endif -static void __init mpc82xx_ads_pic_init(void) +static void __init mpc8272_ads_pic_init(void) { struct device_node *np = of_find_compatible_node(NULL, "cpm-pic", "CPM2"); struct resource r; @@ -553,14 +553,14 @@ static void __init mpc82xx_add_bridge(struct device_node *np) /* * Setup the architecture */ -static void __init mpc82xx_ads_setup_arch(void) +static void __init mpc8272_ads_setup_arch(void) { #ifdef CONFIG_PCI struct device_node *np; #endif if (ppc_md.progress) - ppc_md.progress("mpc82xx_ads_setup_arch()", 0); + ppc_md.progress("mpc8272_ads_setup_arch()", 0); cpm2_reset(); /* Map I/O region to a 256MB BAT */ @@ -582,13 +582,13 @@ static void __init mpc82xx_ads_setup_arch(void) #endif if (ppc_md.progress) - ppc_md.progress("mpc82xx_ads_setup_arch(), finish", 0); + ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0); } /* * Called very early, device-tree isn't unflattened */ -static int __init mpc82xx_ads_probe(void) +static int __init mpc8272_ads_probe(void) { /* We always match for now, eventually we should look at * the flat dev tree to ensure this is the board we are @@ -612,13 +612,13 @@ static void m82xx_restart(char *cmd) while (1) ; } -define_machine(mpc82xx_ads) +define_machine(mpc8272_ads) { - .name = "MPC82xx ADS", - .probe = mpc82xx_ads_probe, - .setup_arch = mpc82xx_ads_setup_arch, - .init_IRQ = mpc82xx_ads_pic_init, - .get_irq = cpm2_get_irq, + .name = "MPC8272 ADS", + .probe = mpc8272_ads_probe, + .setup_arch = mpc8272_ads_setup_arch, + .init_IRQ = mpc8272_ads_pic_init, + .get_irq = cpm2_get_irq, .calibrate_decr = generic_calibrate_decr, .restart = m82xx_restart, };