diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /arch/blackfin/configs/BF526-EZBRD_defconfig | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/blackfin/configs/BF526-EZBRD_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF526-EZBRD_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 80240806cf9e..864af5b68874 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig | |||
| @@ -40,6 +40,7 @@ CONFIG_C_CDPRIO=y | |||
| 40 | CONFIG_BANK_3=0x99B2 | 40 | CONFIG_BANK_3=0x99B2 |
| 41 | CONFIG_BINFMT_FLAT=y | 41 | CONFIG_BINFMT_FLAT=y |
| 42 | CONFIG_BINFMT_ZFLAT=y | 42 | CONFIG_BINFMT_ZFLAT=y |
| 43 | CONFIG_PM=y | ||
| 43 | CONFIG_NET=y | 44 | CONFIG_NET=y |
| 44 | CONFIG_PACKET=y | 45 | CONFIG_PACKET=y |
| 45 | CONFIG_UNIX=y | 46 | CONFIG_UNIX=y |
| @@ -152,7 +153,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 152 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 153 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 153 | CONFIG_EARLY_PRINTK=y | 154 | CONFIG_EARLY_PRINTK=y |
| 154 | CONFIG_CPLB_INFO=y | 155 | CONFIG_CPLB_INFO=y |
| 155 | CONFIG_SECURITY=y | ||
| 156 | CONFIG_CRYPTO=y | 156 | CONFIG_CRYPTO=y |
| 157 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 157 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 158 | CONFIG_CRC_CCITT=m | 158 | CONFIG_CRC_CCITT=m |