diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /arch/powerpc/platforms/ps3/setup.c | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'arch/powerpc/platforms/ps3/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index a413abbd4123..77bc330263c4 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
| @@ -201,7 +201,6 @@ static void __init ps3_setup_arch(void) | |||
| 201 | ps3_firmware_version.rev); | 201 | ps3_firmware_version.rev); |
| 202 | 202 | ||
| 203 | ps3_spu_set_platform(); | 203 | ps3_spu_set_platform(); |
| 204 | ps3_map_htab(); | ||
| 205 | 204 | ||
| 206 | #ifdef CONFIG_SMP | 205 | #ifdef CONFIG_SMP |
| 207 | smp_init_ps3(); | 206 | smp_init_ps3(); |