diff options
| author |  Michael Ellerman <mpe@ellerman.id.au>
| 2016-07-30 13:43:19 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au>
| 2016-07-30 13:43:19 +1000 |
| commit | 719dbb2df78fc9a40e28392b07cd715bfc5a665c (patch) | |
| tree | 0bbc3b84b74178d18164f5522ee3715623f94bbe /arch/powerpc/configs/pq2fads_defconfig | |
| parent | powerpc/mm: Parenthesise IS_ENABLED() in if condition (diff) | |
| parent | powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number (diff) | |
| download | linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.tar.gz linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.tar.bz2 linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
Diffstat (limited to 'arch/powerpc/configs/pq2fads_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pq2fads_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 5432c7a4a51c..50b2bad51d0a 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig @@ -39,7 +39,6 @@ CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_BLK_DEV_LOOP=y -CONFIG_IDE=y CONFIG_NETDEVICES=y CONFIG_TUN=y CONFIG_FS_ENET=y |