diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-12 07:20:31 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-12 07:20:31 +0200 |
| commit | d4e60114d3440cba36202e597c961aac9732a456 (patch) | |
| tree | d15eded3b0f1450c1ff5d13a441e1e8c4155fc3b | |
| parent | a687e94e3fa9b8e3dc2621a71ee9ba55b69b2870 (diff) | |
| parent | 3a5b93a35ece78e397a396b3a0dc5204f7a5fc61 (diff) | |
| download | kernel-4.11.0-0.rc6.git1.1.vanilla.knurd.1.fc24.tar.gz kernel-4.11.0-0.rc6.git1.1.vanilla.knurd.1.fc24.tar.xz kernel-4.11.0-0.rc6.git1.1.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc6.git1.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc6.git1.1.vanilla.knurd.1.fc24
| -rw-r--r-- | baseconfig/arm/CONFIG_HAMRADIO | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/baseconfig/arm/CONFIG_HAMRADIO b/baseconfig/arm/CONFIG_HAMRADIO deleted file mode 100644 index 477ae40db..000000000 --- a/baseconfig/arm/CONFIG_HAMRADIO +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_HAMRADIO is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 074457d35..1e1cbc576 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1711,7 +1711,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 25016612c..fe9587afd 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1694,7 +1694,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 10b8c7182..6c598ab47 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1859,7 +1859,7 @@ CONFIG_GREENASIA_FF=y CONFIG_GS_FPGABOOT=m CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 96b36661a..0dbac4136 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1763,7 +1763,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 82208ebf6..d7b2ff2d2 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1746,7 +1746,7 @@ CONFIG_GREENASIA_FF=y # CONFIG_GS_FPGABOOT is not set CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 3c3dc6ff3..404f1a57d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1842,7 +1842,7 @@ CONFIG_GREENASIA_FF=y CONFIG_GS_FPGABOOT=m CONFIG_GTP=m CONFIG_HAMACHI=m -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y |