aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-04-23 10:55:56 +1000
committerPaul Mackerras <paulus@samba.org>2006-04-23 10:55:56 +1000
commit916a3d5729c8b710d56acf579f3fdb4de7c03e77 (patch)
tree3c063664f777cfd345a2c9d557fdef12f73d773c
parent55308c3712f56279d5547ef6e97d365ac3ab9e6d (diff)
parentd0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da (diff)
downloadlinux-916a3d5729c8b710d56acf579f3fdb4de7c03e77.tar.gz
Merge branch 'merge'
-rw-r--r--include/asm-powerpc/machdep.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 5ed84768075420..0f9254c18914d6 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -253,7 +253,11 @@ extern struct machdep_calls *machine_id;
#define __machine_desc __attribute__ ((__section__ (".machine.desc")))
-#define define_machine(name) struct machdep_calls mach_##name __machine_desc =
+#define define_machine(name) \
+ extern struct machdep_calls mach_##name; \
+ EXPORT_SYMBOL(mach_##name); \
+ struct machdep_calls mach_##name __machine_desc =
+
#define machine_is(name) \
({ \
extern struct machdep_calls mach_##name \