diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 01:26:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 01:26:41 +0100 |
| commit | 22943a6a6ba3bbbf5cc11cec409e779374e88107 (patch) | |
| tree | 9cd343f44c81bc0ca404948707a05604ccbc90ec /arch/arc/Kconfig | |
| parent | Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next (diff) | |
| parent | ARC: rename default defconfig (diff) | |
| download | linux-22943a6a6ba3bbbf5cc11cec409e779374e88107.tar.xz linux-22943a6a6ba3bbbf5cc11cec409e779374e88107.zip | |
Merge tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull arch/arc updates from Vineet Gupta:
"Minor updates for ARC for 3.19"
* tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: rename default defconfig
ARC: [nsimosci] move peripherals to match model to FPGA
ARC: document memory clobber in irq control macros
ARC: R-M-W assist locks only needed for !LLSC
ARC: add power management options
Diffstat (limited to 'arch/arc/Kconfig')
| -rw-r--r-- | arch/arc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index fe44b2494609..df94ac1f75b6 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -428,3 +428,4 @@ source "arch/arc/Kconfig.debug" source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" +source "kernel/power/Kconfig" |