diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/arm/configs/pnx4008_defconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/arm/configs/pnx4008_defconfig')
| -rw-r--r-- | arch/arm/configs/pnx4008_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig index bd481f04276..35a31ccacc3 100644 --- a/arch/arm/configs/pnx4008_defconfig +++ b/arch/arm/configs/pnx4008_defconfig | |||
| @@ -5,7 +5,7 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 5 | CONFIG_AUDIT=y | 5 | CONFIG_AUDIT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_LOG_BUF_SHIFT=14 |
| 7 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
| 8 | CONFIG_EMBEDDED=y | 8 | CONFIG_EXPERT=y |
| 9 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
| 10 | CONFIG_MODULES=y | 10 | CONFIG_MODULES=y |
| 11 | CONFIG_MODULE_UNLOAD=y | 11 | CONFIG_MODULE_UNLOAD=y |