git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
setup.h
diff --git
a/arch/microblaze/include/asm/setup.h
b/arch/microblaze/include/asm/setup.h
index
782b5c8
..
8f39689
100644
(file)
--- a/
arch/microblaze/include/asm/setup.h
+++ b/
arch/microblaze/include/asm/setup.h
@@
-25,6
+25,12
@@
void early_printk(const char *fmt, ...);
int setup_early_printk(char *opt);
void disable_early_printk(void);
int setup_early_printk(char *opt);
void disable_early_printk(void);
+#if defined(CONFIG_EARLY_PRINTK)
+#define eprintk early_printk
+#else
+#define eprintk printk
+#endif
+
void heartbeat(void);
void setup_heartbeat(void);
void heartbeat(void);
void setup_heartbeat(void);