Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / iseries / release_data.h

diff --git a/arch/powerpc/platforms/iseries/release_data.h b/arch/powerpc/platforms/iseries/release_data.h
index c68b9c3e5caf4d35ccfc1c57e1cb9ddfce83556f..6ad7d843e8fc9fc0998ee411227696768579d9bc 100644 (file)
--- a/arch/powerpc/platforms/iseries/release_data.h
+++ b/arch/powerpc/platforms/iseries/release_data.h
@@ -24,7 +24,7 @@
  * address of the OS's NACA).
  */
 #include <asm/types.h>
-#include <asm/naca.h>
+#include "naca.h"
 
 /*
  * When we IPL a secondary partition, we will check if if the
@@ -58,6 +58,6 @@ struct HvReleaseData {
        char    xRsvd3[20];     /* Reserved                     x2C-x3F */
 };
 
-extern struct HvReleaseData    hvReleaseData;
+extern const struct HvReleaseData      hvReleaseData;
 
 #endif /* _ISERIES_RELEASE_DATA_H */