Fabio Estevam 89fbec5b97 ARM: imx: Fix the removal of CONFIG_SPI option ...

Since 64546e9fe3 ("ARM: imx_v6_v7_defconfig updates") and commit
0650f855d2 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI
selection was dropped by savedefconfig for imx_v4_v5_defconfig and
imx_v6_v7_defconfig.

In order to keep the same behaviour as previous kernel versions and avoid
regressions, let's add CONFIG_SPI option back.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

2014-11-04 19:00:01 +08:00

..

alpha

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

arc

Merge tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-10-23 15:04:27 -07:00

arm

ARM: imx: Fix the removal of CONFIG_SPI option

2014-11-04 19:00:01 +08:00

arm64

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2014-10-24 12:48:04 -07:00

avr32

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-10-18 18:11:04 -07:00

blackfin

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

c6x

irq_work: Introduce arch_irq_work_has_interrupt()

2014-09-13 18:38:07 +02:00

cris

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 16:23:15 +02:00

frv

frv: remove unused declarations of __start___ex_table and __stop___ex_table

2014-10-14 02:18:28 +02:00

hexagon

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

ia64

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-23 14:45:09 -07:00

m32r

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

m68k

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2014-10-14 03:51:22 +02:00

metag

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

microblaze

microblaze: Wire up bpf syscall

2014-10-27 09:25:34 +01:00

mips

MIPS: SEAD3: Fix I2C device registration.

2014-10-24 13:34:42 +02:00

mn10300

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

openrisc

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

parisc

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

powerpc

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-31 14:01:47 -07:00

s390

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-31 14:01:47 -07:00

score

score: use Kbuild logic to include <asm-generic/sections.h>

2014-10-09 22:25:46 -04:00

sh

sh: fix sh770x SCIF memory regions

2014-10-29 16:33:15 -07:00

sparc

sparc: Hook up bpf system call.

2014-10-28 11:30:43 -07:00

tile

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

um

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

unicore32

nosave: consolidate __nosave_{begin,end} in <asm/sections.h>

2014-10-09 22:26:04 -04:00

x86

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2014-11-02 12:31:02 -08:00

xtensa

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

.gitignore

…

Kconfig

seccomp: Document two-phase seccomp and arch-provided seccomp_data

2014-09-03 14:58:17 -07:00