diff --git a/[refs] b/[refs] index 6bda34cde08f..6b88c4942400 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f3372741f2de8dc85a60be737b519a47b395b85 +refs/heads/master: ad08587e5df17e192a57437bfedaba125998de25 diff --git a/trunk/arch/powerpc/include/asm/pmc.h b/trunk/arch/powerpc/include/asm/pmc.h index ccc68b50d05d..5a9ede4962cb 100644 --- a/trunk/arch/powerpc/include/asm/pmc.h +++ b/trunk/arch/powerpc/include/asm/pmc.h @@ -29,7 +29,7 @@ int reserve_pmc_hardware(perf_irq_t new_perf_irq); void release_pmc_hardware(void); void ppc_enable_pmcs(void); -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_BOOK3S_64 #include static inline void ppc_set_pmu_inuse(int inuse)