1. 01 3月, 2013 3 次提交
    • R
      watchdog: da9055_wdt needs to select WATCHDOG_CORE · 12a5c05c
      Randy Dunlap 提交于
      DA9055_WATCHDOG (introduced in v3.8) needs to select WATCHDOG_CORE so that it will
      build cleanly.  Fixes these build errors:
      
      da9055_wdt.c:(.text+0xe9bc7): undefined reference to `watchdog_unregister_device'
      da9055_wdt.c:(.text+0xe9f4b): undefined reference to `watchdog_register_device'
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Cc: David Dajun Chen <dchen@diasemi.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Cc: linux-watchdog@vger.kernel.org
      Cc: stable <stable@vger.kernel.org>
      12a5c05c
    • L
      Fix mis-merge of intel_powerclamp.c resulting in compile error · 19cc90f5
      Linus Torvalds 提交于
      The new intel_powerclamp thermal cooling device driver was merged in
      commit 2af78448 (Pull thermal management updates from Zhang Rui)
      without any data conflicts.  But there was a more subtle conflict I
      missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77
      ("sched/rt: Move rt specific bits into new header file") had moved that
      define from <linux/sched.h> to <linux/sched/rt.h>.
      
      Which caused this build failure:
      
        drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
        drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
        drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in
      
      And because I don't do a full "make allmodconfig" build after each pull,
      I didn't notice until too late.  So now the fix is here, separately from
      the merge commit.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      19cc90f5
    • G
      clocksource: time-armada-370-xp: add local timer support · ddd3f69f
      Gregory CLEMENT 提交于
      On the SOCs Armada 370 and Armada XP, each CPU comes with two private
      timers. This patch use the timer 0 of each CPU as local timer for the
      clockevent if CONFIG_LOCAL_TIMER is selected. In the other case, use
      only the private Timer 0 of CPU 0.
      Signed-off-by: NGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: NJason Cooper <jason@lakedaemon.net>
      ddd3f69f
  2. 28 2月, 2013 37 次提交