diff options
| author | David S. Miller <davem@davemloft.net> | 2023-02-17 11:06:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-02-17 11:06:39 +0000 |
| commit | 675f176b4dcc2b75adbcea7ba0e9a649527f53bd (patch) | |
| tree | dc5eea870c19b405bb6558964e5367bb6c9205c5 /arch/powerpc/Kconfig | |
| parent | 84cb1b53cdbad52642571e31a8aee301206d2043 (diff) | |
| parent | ec35307e18ba8174e2a3f701956059f6a36f22fb (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Some of the devlink bits were tricky, but I think I got it right.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b8c4ac56bddc..7a5f8dbfbdd0 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -163,7 +163,6 @@ config PPC select ARCH_WANT_IRQS_OFF_ACTIVATE_MM select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_MODULES_DATA_IN_VMALLOC if PPC_BOOK3S_32 || PPC_8xx - select ARCH_WANTS_NO_INSTR select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF select BUILDTIME_TABLE_SORT |