Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 73be9b349690..ed1949c29508 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -406,9 +406,9 @@ static struct board_info __initdata board_FAST2404 = {
         .expected_cpu_id                = 0x6348,
 
         .has_uart0                      = 1,
-        .has_enet0                      = 1,
-        .has_enet1                      = 1,
-        .has_pci                        = 1,
+        .has_enet0                      = 1,
+        .has_enet1                      = 1,
+        .has_pci                        = 1,
 
         .enet0 = {
                 .has_phy                = 1,
@@ -591,22 +591,22 @@ static struct board_info __initdata board_96358vw2 = {
 };
 
 static struct board_info __initdata board_AGPFS0 = {
-        .name                           = "AGPF-S0",
-        .expected_cpu_id                = 0x6358,
+        .name                           = "AGPF-S0",
+        .expected_cpu_id                = 0x6358,
 
         .has_uart0                      = 1,
-        .has_enet0                      = 1,
-        .has_enet1                      = 1,
-        .has_pci                        = 1,
+        .has_enet0                      = 1,
+        .has_enet1                      = 1,
+        .has_pci                        = 1,
 
         .enet0 = {
-                .has_phy                = 1,
-                .use_internal_phy       = 1,
+                .has_phy                = 1,
+                .use_internal_phy       = 1,
         },
 
         .enet1 = {
-                .force_speed_100        = 1,
-                .force_duplex_full      = 1,
+                .force_speed_100        = 1,
+                .force_duplex_full      = 1,
         },
 
         .has_ohci0 = 1,
@@ -677,7 +677,7 @@ static struct ssb_sprom bcm63xx_sprom = {
         .revision               = 0x02,
         .board_rev              = 0x17,
         .country_code           = 0x0,
-        .ant_available_bg       = 0x3,
+        .ant_available_bg       = 0x3,
         .pa0b0                  = 0x15ae,
         .pa0b1                  = 0xfa85,
         .pa0b2                  = 0xfe8d,