summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-01-25 00:44:16 +0100
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-01-26 23:03:21 +0100
commit586655d278ba08af7b198b93217746f9a506ee8a (patch)
treeb5eb49de3fdf08b0b53dc87f59c5a87f01d1e077 /net/core
parent7ce7d89f48834cefece7804d38fc5d85382edf77 (diff)
rtc: jz4740: make the driver buildable as a module again
By using kernel_halt() instead of machine_halt(), we can make the driver build as a module. However, jz4740 platforms not loading this module will not be able to power off. Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Revert "rtc: jz4740: make the driver builtin only" This reverts commit b9168c539c0b2de756aaffd380384dbde8adbe07.
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions
069646b593d3439171a8a8e2&id2=2b2d3eb41c920b47df2fcedd1489cf748bd09466'>diff)
Merge branch 'sh_eth-E-DMAC-interrupt-mask-cleanups'
Sergei Shtylyov says: ==================== sh_eth: E-DMAC interrupt mask cleanups Here's a set of 3 patches against DaveM's 'net-next.git' repo. The main goal of this set is to stop using the bare numbers for the E-DMAC interrupt masks. [1/3] sh_eth: rename EESIPR bits [2/3] sh_eth: add missing EESIPR bits [3/3] sh_eth: stop using bare numbers for EESIPR values ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/sunrpc_syms.c')