summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-01-14 16:52:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-01-14 16:52:11 +0300
commit34cbf89afc866df36d6b9177e4f99160a4823382 (patch)
treebf148ad1e3d5ef498a0122b14307a48160fd84ac
parent97ec4d559d939743e8af83628be5af8da610d9dc (diff)
parent22eebaa631c40f3dac169ba781e0de471b83bf45 (diff)
downloadlinux-34cbf89afc866df36d6b9177e4f99160a4823382.tar.xz
Merge tag 'ata-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata
Pull ATA fix from Damien Le Moal: "A single fix to prevent building the pata_cs5535 driver with user mode linux as it uses msr operations that are not defined with UML" * tag 'ata-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: ata: pata_cs5535: Don't build on UML
-rw-r--r--drivers/ata/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index eceaec33af65..9695c4404e26 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -640,6 +640,7 @@ config PATA_CS5530
config PATA_CS5535
tristate "CS5535 PATA support (Experimental)"
depends on PCI && (X86_32 || (X86_64 && COMPILE_TEST))
+ depends on !UML
help
This option enables support for the NatSemi/AMD CS5535
companion chip used with the Geode processor family.