diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 19:59:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 19:59:13 +0100 |
| commit | 5977aa66c47f8e9629e88f1e983951a09801ccef (patch) | |
| tree | 91a372df6bd5c11b7c8eb577f3aaa1df486e2441 /drivers/platform | |
| parent | Merge tag 'for-linus-6.2-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | MIPS: OCTEON: warn only once if deprecated link status is being used (diff) | |
| download | linux-5977aa66c47f8e9629e88f1e983951a09801ccef.tar.xz linux-5977aa66c47f8e9629e88f1e983951a09801ccef.zip | |
Merge tag 'mips_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer:
- DT cleanups
- fix for early use of kzalloc on mt7621 platform
- cleanups and fixes
* tag 'mips_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (21 commits)
MIPS: OCTEON: warn only once if deprecated link status is being used
MIPS: BCM63xx: Add check for NULL for clk in clk_enable
platform/mips: Adjust Kconfig to keep consistency
MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy()
MIPS: mscc: jaguar2: Fix pca9545 i2c-mux node names
mips/pci: use devm_platform_ioremap_resource()
mips: ralink: mt7621: do not use kzalloc too early
mips: ralink: mt7621: soc queries and tests as functions
mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem
MIPS: Restore symbol versions for copy_page_cpu and clear_page_cpu
mips: dts: remove label = "cpu" from DSA dt-binding
mips: ralink: mt7621: change DSA port labels to generic naming
mips: ralink: mt7621: fix phy-mode of external phy on GB-PC2
MIPS: vpe-cmp: fix possible memory leak while module exiting
MIPS: vpe-mt: fix possible memory leak while module exiting
dt-bindings: mips: brcm: add Broadcom SoCs bindings
dt-bindings: mips: add CPU bindings for MIPS architecture
mips: dts: brcm: bcm7435: add "interrupt-names" for NAND controller
mips: dts: bcm63268: add TWD block timer
MIPS: Use "grep -E" instead of "egrep"
...
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/platform/mips/Kconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig index dbd327712205..868b20361769 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -if MIPS source "drivers/platform/mips/Kconfig" -endif source "drivers/platform/loongarch/Kconfig" diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig index 6b51ad01f791..fb4ac4b08e89 100644 --- a/drivers/platform/mips/Kconfig +++ b/drivers/platform/mips/Kconfig @@ -6,6 +6,7 @@ menuconfig MIPS_PLATFORM_DEVICES bool "MIPS Platform Specific Device Drivers" default y + depends on MIPS help Say Y here to get to see options for device drivers of various MIPS platforms, including vendor-specific netbook/laptop/desktop |