diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
| commit | 5bb47b9ff3d16d40f8d45380b373497a545fa280 (patch) | |
| tree | e13dd34395473342dc75eff5cbaf5b1ea753631c /arch/blackfin/kernel/cplb-nompu/Makefile | |
| parent | 2f2408a88cf8fa43febfd7fb5783e61b2937b0f9 (diff) | |
| parent | 06af15e086e39a5a2a2413973a64af8e10122f28 (diff) | |
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: (171 commits)
Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
Blackfin arch: fix bug: kernel crash when enable SDIO host driver
Blackfin arch: Print FP at level KERN_NOTICE
Blackfin arch: drop ad73311 test code
Blackfin arch: update board default configs
Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
Blackfin arch: fix typo in early printk bit size processing
Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
Blackfin arch: add SDIO host driver platform data
Blackfin arch: fix bug - kernel stops at initial console
Blackfin arch: fix bug - kernel crash after config IP for ethernet port
Blackfin arch: add sdh support for bf518f-ezbrd
Blackfin arch: fix bug - kernel detects BF532 incorrectly
Blackfin arch: add () to avoid warnings from gcc
Blackfin arch: change HWTRACE Kconfig and set it on default
Blackfin arch: Clean oprofile build path for blackfin
Blackfin arch: remove hardware PM code, oprofile not use it
Blackfin arch: rewrite get_sclk()/get_vco()
Blackfin arch: cleanup and unify the ins functions
...
Diffstat (limited to 'arch/blackfin/kernel/cplb-nompu/Makefile')
| -rw-r--r-- | arch/blackfin/kernel/cplb-nompu/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/Makefile b/arch/blackfin/kernel/cplb-nompu/Makefile index d36ea9b5382e..7d70d3bf3212 100644 --- a/arch/blackfin/kernel/cplb-nompu/Makefile +++ b/arch/blackfin/kernel/cplb-nompu/Makefile | |||
| @@ -2,7 +2,9 @@ | |||
| 2 | # arch/blackfin/kernel/cplb-nompu/Makefile | 2 | # arch/blackfin/kernel/cplb-nompu/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := cplbinit.o cacheinit.o cplbhdlr.o cplbmgr.o | 5 | obj-y := cplbinit.o cacheinit.o cplbmgr.o |
| 6 | |||
| 7 | obj-$(CONFIG_CPLB_INFO) += cplbinfo.o | ||
| 8 | 6 | ||
| 7 | CFLAGS_cplbmgr.o := -ffixed-I0 -ffixed-I1 -ffixed-I2 -ffixed-I3 \ | ||
| 8 | -ffixed-L0 -ffixed-L1 -ffixed-L2 -ffixed-L3 \ | ||
| 9 | -ffixed-M0 -ffixed-M1 -ffixed-M2 -ffixed-M3 \ | ||
| 10 | -ffixed-B0 -ffixed-B1 -ffixed-B2 -ffixed-B3 | ||