diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /arch/avr32/boards/merisc/Makefile | |
parent | xfs: prevent deadlock in xfs_qm_shake() (diff) | |
parent | Linux 2.6.30 (diff) | |
download | linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.tar.xz linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/avr32/boards/merisc/Makefile')
-rw-r--r-- | arch/avr32/boards/merisc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/boards/merisc/Makefile b/arch/avr32/boards/merisc/Makefile new file mode 100644 index 000000000000..d24c78729bd1 --- /dev/null +++ b/arch/avr32/boards/merisc/Makefile @@ -0,0 +1 @@ +obj-y += setup.o flash.o display.o merisc_sysfs.o |