git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
Makefile
diff --git
a/arch/arm/mach-s3c2410/Makefile
b/arch/arm/mach-s3c2410/Makefile
index 1217bf00309c7049d508d90c2c2614b662a705e2..1b3b476e563704872ea0ddba1c5f069c6d220408 100644
(file)
--- a/
arch/arm/mach-s3c2410/Makefile
+++ b/
arch/arm/mach-s3c2410/Makefile
@@
-38,6
+38,7
@@
obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o
# machine specific support
obj-$(CONFIG_MACH_ANUBIS) += mach-anubis.o
+obj-$(CONFIG_MACH_OSIRIS) += mach-osiris.o
obj-$(CONFIG_ARCH_BAST) += mach-bast.o usb-simtec.o
obj-$(CONFIG_ARCH_H1940) += mach-h1940.o
obj-$(CONFIG_MACH_N30) += mach-n30.o