aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/celleb/scc_uhc.c
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2007-12-13 21:13:14 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-20 16:15:30 +1100
commit7e1961ff4954d6ab627d9b606785afdcd0dda84b (patch)
tree74b6414cf51dd9d08b5279eb9242209ec6f7f751 /arch/powerpc/platforms/celleb/scc_uhc.c
parent4751505cf7299318d19a42bdabe0eb5db6d732c4 (diff)
[POWERPC] celleb: Split machine definition
This splits the machine definition for celleb into two definitions, one for celleb_beat, and the other for celleb_native. Though this looks complex because of sorting some functions, there are no more semantic changes than that for the splitting. Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/celleb/scc_uhc.c')
-rw-r--r--arch/powerpc/platforms/celleb/scc_uhc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/celleb/scc_uhc.c b/arch/powerpc/platforms/celleb/scc_uhc.c
index b59c38a06e3..cb430799408 100644
--- a/arch/powerpc/platforms/celleb/scc_uhc.c
+++ b/arch/powerpc/platforms/celleb/scc_uhc.c
@@ -47,7 +47,8 @@ static void enable_scc_uhc(struct pci_dev *dev)
u32 val = 0;
int i;
- if (!machine_is(celleb))
+ if (!machine_is(celleb_beat) &&
+ !machine_is(celleb_native))
return;
uhc_base = ioremap(pci_resource_start(dev, 0),