From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 29 Aug 2012 07:24:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-eth-gw
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/can-eth-gw.git/commitdiff_plain/779f3a62d8774dfb145946092e650ff556b6aa40

Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-eth-gw

Conflicts:
	kernel/Makefile
---

779f3a62d8774dfb145946092e650ff556b6aa40
diff --cc kernel/Makefile
index 1cbdd72,624d6d0..7fe1007
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -1,13 -1,10 +1,18 @@@
  obj-m += canethgw.o
  
 -all: debug
 -bench:
 -	make -C ../distro/kernel-bench M=`pwd`
 -debug:
 -	make -C ../distro/kernel-debug M=`pwd`
 +-include Makefile.local
 +# /usr/src/linux/_build_qemu
 +
 +KERNEL_DIR ?= /lib/modules/`uname -r`/build
 +
 +all:
 +	make -C $(KERNEL_DIR) M=`pwd`
 +install:
 +	make -C $(KERNEL_DIR) M=`pwd` modules_install
  clean:
 -	make -C ../distro/kernel-debug M=`pwd` clean
 +	make -C $(KERNEL_DIR) M=`pwd` clean
+ 
++bench:
++	$(MAKE) KERNEL_DIR=../distro/kernel-bench
++debug:
++	$(MAKE) KERNEL_DIR=../distro/kernel-debug