summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Medhurst2012-05-18 03:07:18 -0500
committerJon Medhurst2012-05-18 03:07:18 -0500
commitac510b08741d72d89da5f909ad483f7080e46fea (patch)
tree06ddf5fdd7dbaf5171c648145d1a2027aaa4e18d
parentcf81facb732aa92b23e5bba77a9b711fdfb73297 (diff)
parentf7e8a3d4bed65fb0fdb846f53aad7b0a763767c7 (diff)
downloadarm-ds5-gator-ac510b08741d72d89da5f909ad483f7080e46fea.tar.gz
arm-ds5-gator-ac510b08741d72d89da5f909ad483f7080e46fea.tar.xz
arm-ds5-gator-ac510b08741d72d89da5f909ad483f7080e46fea.zip
Merge branch 'master' into android
-rw-r--r--driver/gator_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/gator_main.c b/driver/gator_main.c
index 7d48812..988045f 100644
--- a/driver/gator_main.c
+++ b/driver/gator_main.c
@@ -48,9 +48,9 @@ static unsigned long gator_protocol_version = 9;
48 48
49#if (GATOR_PERF_SUPPORT) && (!(GATOR_PERF_PMU_SUPPORT)) 49#if (GATOR_PERF_SUPPORT) && (!(GATOR_PERF_PMU_SUPPORT))
50#ifndef CONFIG_PERF_EVENTS 50#ifndef CONFIG_PERF_EVENTS
51#error gator requires the kernel to have CONFIG_PERF_EVENTS defined to support pmu hardware counters 51#warning gator requires the kernel to have CONFIG_PERF_EVENTS defined to support pmu hardware counters
52#elif !defined CONFIG_HW_PERF_EVENTS 52#elif !defined CONFIG_HW_PERF_EVENTS
53#error gator requires the kernel to have CONFIG_HW_PERF_EVENTS defined to support pmu hardware counters 53#warning gator requires the kernel to have CONFIG_HW_PERF_EVENTS defined to support pmu hardware counters
54#endif 54#endif
55#endif 55#endif
56 56