merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-2.6] / arch / um / kernel / vmlinux.lds.S
1 #include <linux/config.h>
2 #ifdef CONFIG_LD_SCRIPT_STATIC
3 #include "uml.lds.S"
4 #else
5 #include "dyn.lds.S"
6 #endif