Merge branches 'release', 'bugzilla-11880', 'bugzilla-12037' and 'bugzilla-12257...
[linux-2.6] / arch / um / kernel / vmlinux.lds.S
1 #ifdef CONFIG_LD_SCRIPT_STATIC
2 #include "uml.lds.S"
3 #else
4 #include "dyn.lds.S"
5 #endif