diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
| commit | a1fb6696c662920f695c97591d759391aca8a1ad (patch) | |
| tree | 25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /arch/nios2/configs/3c120_defconfig | |
| parent | x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases (diff) | |
| parent | Linux 4.0-rc1 (diff) | |
| download | linux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.xz linux-a1fb6696c662920f695c97591d759391aca8a1ad.zip | |
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/nios2/configs/3c120_defconfig')
| -rw-r--r-- | arch/nios2/configs/3c120_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/nios2/configs/3c120_defconfig b/arch/nios2/configs/3c120_defconfig index 87541f0a5d6e..9451940678a0 100644 --- a/arch/nios2/configs/3c120_defconfig +++ b/arch/nios2/configs/3c120_defconfig @@ -22,6 +22,7 @@ CONFIG_NIOS2_DCACHE_SIZE=0x8000 CONFIG_NIOS2_ICACHE_SIZE=0x8000 # CONFIG_NIOS2_CMDLINE_IGNORE_DTB is not set CONFIG_NIOS2_PASS_CMDLINE=y +CONFIG_NIOS2_BOOT_LINK_OFFSET=0x00800000 CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y |