Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
1  2 
driver/gator_main.c

diff --combined driver/gator_main.c
index 3ecd0309919ee1f10e29448cd5133a530c8e0a24,1af044bd387f07bf4dfd47bda41f30eb751c0a73..924bcba456f40a6b3ced9e1a2fbba5d47f9c662d
@@@ -18,6 -18,7 +18,7 @@@ static unsigned long gator_protocol_ver
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
  #include <linux/suspend.h>
+ #include <linux/module.h>
  #include <asm/stacktrace.h>
  #include <asm/uaccess.h>
  
  #define MESSAGE_SCHEDULER_TRACE               9
  #define MESSAGE_PID_NAME                      11
  
 +#if 0 /* Disabled because of changes in Linaro 3.1 kernel */
  #define LINUX_PMU_SUPPORT LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) && defined(CONFIG_CPU_HAS_PMU)
 +#else
 +#define LINUX_PMU_SUPPORT 0
 +#endif
  
  #if defined(__arm__)
  #define PC_REG regs->ARM_pc