Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c75ac712df81bf0b9a561bd89f74282650440035
Commit: c75ac712df81bf0b9a561bd89f74282650440035
Parent: 2cfc5be7df26b6fbe9a293e2abf388a6e5b9a39e
Author: Jeff Bailey <[EMAIL PROTECTED]>
AuthorDate: Fri Sep 28 14:22:19 2007 -0400
Committer: Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Thu Oct 18 00:58:29 2007 -0700
[PARISC] Export pdc.h for palo
Signed-off-by: Jeff Bailey <[EMAIL PROTECTED]>
Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
include/asm-parisc/Kbuild | 2 ++
include/asm-parisc/pdc.h | 19 +++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild
index c68e168..f88b252 100644
--- a/include/asm-parisc/Kbuild
+++ b/include/asm-parisc/Kbuild
@@ -1 +1,3 @@
include include/asm-generic/Kbuild.asm
+
+unifdef-y += pdc.h
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h
index 876fd81..775726d 100644
--- a/include/asm-parisc/pdc.h
+++ b/include/asm-parisc/pdc.h
@@ -143,14 +143,15 @@
#define PDC_MEM_RET_PDT_FULL -11
#define PDC_MEM_RET_INVALID_PHYSICAL_LOCATION ~0ULL
-#ifndef __ASSEMBLY__
+#ifdef __KERNEL__
+# ifndef __ASSEMBLY__
typedef struct {
unsigned long long baseAddr;
unsigned int pages;
unsigned int reserved;
} MemAddrTable_t;
-#endif
-
+# endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
#define PDC_PSW 21 /* Get/Set default System Mask
*/
#define PDC_PSW_MASK 0 /* Return mask */
@@ -296,8 +297,11 @@ typedef struct {
#define OSTAT_ON 7
#ifndef __ASSEMBLY__
-
#include <linux/types.h>
+#endif /* __ASSEMBLY__ */
+
+#ifdef __KERNEL__
+# ifndef __ASSEMBLY__
extern int pdc_type;
@@ -558,7 +562,8 @@ struct pdc_hpmc_pim_20 { /* PDC_PIM */
__u64 fr[32];
};
-#endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
/* flags of the device_path (see below) */
#define PF_AUTOBOOT 0x80
@@ -707,6 +712,7 @@ struct zeropage {
#define BOOT_CONSOLE_SPA_OFFSET 0x3c4
#define BOOT_CONSOLE_PATH_OFFSET 0x3a8
+#ifdef __KERNEL__
#ifndef __ASSEMBLY__
void pdc_console_init(void); /* in pdc_console.c */
void pdc_console_restart(void);
@@ -786,6 +792,7 @@ static inline char * os_id_to_string(u16 os_id) {
default: return "Unknown";
}
}
-#endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
#endif /* _PARISC_PDC_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
