diff options
| author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-12-13 21:13:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 16:15:30 +1100 |
| commit | 7e1961ff4954d6ab627d9b606785afdcd0dda84b (patch) | |
| tree | 74b6414cf51dd9d08b5279eb9242209ec6f7f751 /arch/powerpc/platforms/cell | |
| parent | 4751505cf7299318d19a42bdabe0eb5db6d732c4 (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/cell')
| -rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 39fa2149fd0..1221c6d8650 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c @@ -700,8 +700,8 @@ static int __init cell_iommu_init(void) { struct device_node *np; - if ((!machine_is(cell) && !machine_is(celleb)) || - firmware_has_feature(FW_FEATURE_LPAR)) + if (!machine_is(cell) && + !machine_is(celleb_native)) return -ENODEV; /* If IOMMU is disabled or we have little enough RAM to not need |