diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:25:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:25:27 +0200 |
commit | 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3 (patch) | |
tree | 69cc9c6cd24175d704de5a50db14cdb05df3e609 /arch/blackfin/mach-bf537/boards/Makefile | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
parent | 8250 Serial Driver: revert extra IRQ flag definition patch (diff) | |
download | linux-00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3.tar.xz linux-00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
8250 Serial Driver: revert extra IRQ flag definition patch
Blackfin arch: update anomaly headers from toolchain trunk
Blackfin arch: Remove bad and usless code
Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
Blackfin arch: Fix typo. it should be _outsw_8
Blackfin arch: Cleanup no functional changes
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/Makefile')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile index 87e450f29e37..c94f7a5b8211 100644 --- a/arch/blackfin/mach-bf537/boards/Makefile +++ b/arch/blackfin/mach-bf537/boards/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o -obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o +obj-$(CONFIG_BFIN537_STAMP) += stamp.o obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o obj-$(CONFIG_PNAV10) += pnav10.o obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o |