Pull video into release branch

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / ps3 / os-area.c

diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 58358305dc10061bebe54a4b0b6281c6b82bd9f2..b70e474014f028c9da8c938d164e7c7d4defcd26 100644 (file)
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 
 #include <asm/lmb.h>
-#include <asm/ps3.h>
 
 #include "platform.h"
 
@@ -59,20 +58,13 @@ struct os_area_header {
        u32 ldr_format;
        u32 ldr_size;
        u32 _reserved_2[6];
-} __attribute__ ((packed));
+};
 
 enum {
        PARAM_BOOT_FLAG_GAME_OS = 0,
        PARAM_BOOT_FLAG_OTHER_OS = 1,
 };
 
-enum {
-       PARAM_AV_MULTI_OUT_NTSC = 0,
-       PARAM_AV_MULTI_OUT_PAL_RGB = 1,
-       PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
-       PARAM_AV_MULTI_OUT_SECAM = 3,
-};
-
 enum {
        PARAM_CTRL_BUTTON_O_IS_YES = 0,
        PARAM_CTRL_BUTTON_X_IS_YES = 1,
@@ -114,7 +106,7 @@ struct os_area_params {
        u8 dns_primary[4];
        u8 dns_secondary[4];
        u8 _reserved_5[8];
-} __attribute__ ((packed));
+};
 
 /**
  * struct saved_params - Static working copies of data from the 'Other OS' area.
@@ -141,7 +133,7 @@ struct saved_params {
 } static saved_params;
 
 #define dump_header(_a) _dump_header(_a, __func__, __LINE__)
-static void _dump_header(const struct os_area_header __iomem *h, const char* func,
+static void _dump_header(const struct os_area_header *h, const char *func,
        int line)
 {
        pr_debug("%s:%d: h.magic_num:         '%s'\n", func, line,
@@ -159,7 +151,7 @@ static void _dump_header(const struct os_area_header __iomem *h, const char* fun
 }
 
 #define dump_params(_a) _dump_params(_a, __func__, __LINE__)
-static void _dump_params(const struct os_area_params __iomem *p, const char* func,
+static void _dump_params(const struct os_area_params *p, const char *func,
        int line)
 {
        pr_debug("%s:%d: p.boot_flag:       %u\n", func, line, p->boot_flag);
@@ -257,3 +249,13 @@ u64 ps3_os_area_rtc_diff(void)
 {
        return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
 }
+
+/**
+ * ps3_os_area_get_av_multi_out - Returns the default video mode.
+ */
+
+enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void)
+{
+    return saved_params.av_multi_out;
+}
+EXPORT_SYMBOL_GPL(ps3_os_area_get_av_multi_out);