diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
| commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
| tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /arch/ppc64/kernel/pmac_setup.c | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
| parent | c594adad5653491813959277fb87a2fef54c4e05 (diff) | |
| download | talos-op-linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.gz talos-op-linux-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.zip | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pmac_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c index e40877fa67cd..8ff86a766cdf 100644 --- a/arch/ppc64/kernel/pmac_setup.c +++ b/arch/ppc64/kernel/pmac_setup.c @@ -71,6 +71,7 @@ #include <asm/of_device.h> #include <asm/lmb.h> #include <asm/smu.h> +#include <asm/pmc.h> #include "pmac.h" #include "mpic.h" @@ -511,4 +512,5 @@ struct machdep_calls __initdata pmac_md = { .progress = pmac_progress, .check_legacy_ioport = pmac_check_legacy_ioport, .idle_loop = native_idle, + .enable_pmcs = power4_enable_pmcs, }; |
