summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2008-07-17 09:06:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 18:05:12 +0200
commit7023cc61292f9cd61d99521206480f6e387132ff (patch)
tree0adb65e272e8818e5582bf061db29a5e1a300362 /Makefile
parentscsi_dh: Verify "dev" is a sdev before accessing it. (diff)
downloadlinux-7023cc61292f9cd61d99521206480f6e387132ff.tar.xz
linux-7023cc61292f9cd61d99521206480f6e387132ff.zip
Fix collateral damage to top level Makefile
The patch named "powerpc/mpc5121: Add clock driver", also contained an unrelated and bogus change to the top-level makefile. This patch backs out the bad bit. SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5) Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Repented-by: John Rigby <jrigby@freescale.com> [ Heh. Normally I pick these out from the diffstats, but I guess I've grown to trust the ppc tree too much ;) - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1564577bdc53..6192922de9c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-FRED=42
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26