summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/local.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-08-08 16:41:23 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-08-08 16:41:23 +0900
commit4791d63bd40ec63c533060707dae0232b9969dc0 (patch)
tree8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/sparc/include/asm/local.h
parentb3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff)
parent322a8b034003c0d46d39af85bf24fee27b902f48 (diff)
downloadblackbird-op-linux-4791d63bd40ec63c533060707dae0232b9969dc0.tar.gz
blackbird-op-linux-4791d63bd40ec63c533060707dae0232b9969dc0.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/sparc/include/asm/local.h')
-rw-r--r--arch/sparc/include/asm/local.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/local.h b/arch/sparc/include/asm/local.h
deleted file mode 100644
index bc80815a435c..000000000000
--- a/arch/sparc/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SPARC_LOCAL_H
-#define _SPARC_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif
OpenPOWER on IntegriCloud