diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/blackfin/configs/BF538-EZKIT_defconfig | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/blackfin/configs/BF538-EZKIT_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF538-EZKIT_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig index a1f766bf7d9b..cb32f5624a1b 100644 --- a/arch/blackfin/configs/BF538-EZKIT_defconfig +++ b/arch/blackfin/configs/BF538-EZKIT_defconfig | |||
| @@ -726,7 +726,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
| 726 | CONFIG_SIMPLE_GPIO=m | 726 | CONFIG_SIMPLE_GPIO=m |
| 727 | # CONFIG_VT is not set | 727 | # CONFIG_VT is not set |
| 728 | # CONFIG_DEVKMEM is not set | 728 | # CONFIG_DEVKMEM is not set |
| 729 | # CONFIG_BFIN_JTAG_COMM is not set | 729 | CONFIG_BFIN_JTAG_COMM=m |
| 730 | # CONFIG_SERIAL_NONSTANDARD is not set | 730 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 731 | 731 | ||
| 732 | # | 732 | # |