diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 06:15:54 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 06:15:54 -0800 |
| commit | a46052c1941fd5ac1d8a73f1be32283493f21562 (patch) | |
| tree | c91fd17c85c91deb707375129956538d3be2b91d /arch/arm/configs/kzm9g_defconfig | |
| parent | 94058fc593c7d309af112d3124ae0fbb6880d8ec (diff) | |
| parent | 67e13cbb807c6b95706e4ec0ca2c068f14f25588 (diff) | |
Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
"I will work on the suggestions by Arnd to reduce the number
of defconfigs for shmobile - in essence moving towards one or
two generic configs rather than per-board configs. However,
this seems to be somewhat non-trivial and in the mean time
I would like to keep updating the existing defcoings."
* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default
ARM: shmobile: armadillo800eva: enable L2X0 cache on defconfig
ARM: shmobile: mackerel: defconfig update
Diffstat (limited to 'arch/arm/configs/kzm9g_defconfig')
| -rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index ce99e3e00efa..afbae287436b 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -124,7 +124,6 @@ CONFIG_STAGING=y CONFIG_SENSORS_AK8975=y CONFIG_IIO=y # CONFIG_DNOTIFY is not set -CONFIG_INOTIFY_USER=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set |