Commit 34cbf89a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 97ec4d55 22eebaa6
...@@ -640,6 +640,7 @@ config PATA_CS5530 ...@@ -640,6 +640,7 @@ config PATA_CS5530
config PATA_CS5535 config PATA_CS5535
tristate "CS5535 PATA support (Experimental)" tristate "CS5535 PATA support (Experimental)"
depends on PCI && (X86_32 || (X86_64 && COMPILE_TEST)) depends on PCI && (X86_32 || (X86_64 && COMPILE_TEST))
depends on !UML
help help
This option enables support for the NatSemi/AMD CS5535 This option enables support for the NatSemi/AMD CS5535
companion chip used with the Geode processor family. companion chip used with the Geode processor family.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment