diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 14:52:48 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 14:52:48 +0000 |
commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/blackfin/mm/Makefile | |
parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
download | op-kernel-dev-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip op-kernel-dev-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.gz |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/blackfin/mm/Makefile')
-rw-r--r-- | arch/blackfin/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mm/Makefile b/arch/blackfin/mm/Makefile index d489f89..4c011b1f6 100644 --- a/arch/blackfin/mm/Makefile +++ b/arch/blackfin/mm/Makefile @@ -2,4 +2,4 @@ # arch/blackfin/mm/Makefile # -obj-y := sram-alloc.o isram-driver.o init.o +obj-y := sram-alloc.o isram-driver.o init.o maccess.o |