From: Christian Lamparter <chunkeey@googlemail.com>
Date: Thu, 13 Sep 2012 22:29:46 +0000 (+0200)
Subject: Merge branch 'master' into radar
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9;p=carl9170fw.git

Merge branch 'master' into radar

Conflicts:
	tools/src/CMakeLists.txt
---

d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9
diff --cc tools/src/CMakeLists.txt
index 4605aa4,d141521..19ec508
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@@ -4,7 -4,7 +4,7 @@@ project(tools
  
  add_custom_target(wol ALL COMMAND gcc wol.c -o wol)
  
- set(tools fwinfo miniboot checksum fwprepare eeprom_fix)
 -set(tools fwinfo miniboot checksum)
++set(tools fwinfo miniboot checksum fwprepare)
  
  foreach(tool ${tools})
  	add_executable( ${tool} ${tool}.c )