Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / samples / Makefile
blob33454039f7c64a51ff696885ddbcefc5e22e1ed1
1 # Makefile for Linux samples code
3 <<<<<<< HEAD:samples/Makefile
4 obj-$(CONFIG_SAMPLES) += markers/ kobject/
5 =======
6 obj-$(CONFIG_SAMPLES) += markers/ kobject/ kprobes/
7 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:samples/Makefile