OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[uclinux-h8/linux.git]
/
arch
/
arm
/
configs
/
sama5_defconfig
diff --git
a/arch/arm/configs/sama5_defconfig
b/arch/arm/configs/sama5_defconfig
index
3d9ee7a
..
b58fb32
100644
(file)
--- a/
arch/arm/configs/sama5_defconfig
+++ b/
arch/arm/configs/sama5_defconfig
@@
-20,7
+20,6
@@
CONFIG_ARCH_AT91=y
CONFIG_SOC_SAM_V7=y
CONFIG_SOC_SAMA5D3=y
CONFIG_SOC_SAMA5D4=y
-CONFIG_MACH_SAMA5_DT=y
CONFIG_AEABI=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_ZBOOT_ROM_TEXT=0x0