diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:49:55 -0500 |
commit | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (patch) | |
tree | 4e6fffa65f38addffc149a5fe88be3d2161eaf6e /arch/blackfin/configs/BF538-EZKIT_defconfig | |
parent | 028e1415a78733fcd2cba4b4c001826cc37a373e (diff) | |
parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 | # |