| Message ID | 1421173517-21246-1-git-send-email-alexandre.belloni@free-electrons.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 13, 2015 at 07:25:17PM +0100, Alexandre Belloni wrote: > Until the driver is corrected to stop using mach/at91isam9_smc.h, it won't > compile in a ARCH_MULTIPLATFORM configuration. > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Applied to libata/for-3.19-fixes. Thanks.
Le 13/01/2015 19:25, Alexandre Belloni a écrit : > Until the driver is corrected to stop using mach/at91isam9_smc.h, it won't > compile in a ARCH_MULTIPLATFORM configuration. > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > drivers/ata/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig > index a3a13605a9c4..5f601553b9b0 100644 > --- a/drivers/ata/Kconfig > +++ b/drivers/ata/Kconfig > @@ -835,6 +835,7 @@ config PATA_AT32 > config PATA_AT91 > tristate "PATA support for AT91SAM9260" > depends on ARM && SOC_AT91SAM9 > + depends on !ARCH_MULTIPLATFORM > help > This option enables support for IDE devices on the Atmel AT91SAM9260 SoC. > >
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index a3a13605a9c4..5f601553b9b0 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -835,6 +835,7 @@ config PATA_AT32 config PATA_AT91 tristate "PATA support for AT91SAM9260" depends on ARM && SOC_AT91SAM9 + depends on !ARCH_MULTIPLATFORM help This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.
Until the driver is corrected to stop using mach/at91isam9_smc.h, it won't compile in a ARCH_MULTIPLATFORM configuration. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+)