diff --git a/[refs] b/[refs]
index 383ba8305e2f..2d15a592e900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0bbbc73d58f1b774cd987b5687a478a027f137c
+refs/heads/master: 0ce030395b92270567423d57d9d432eb77df32f2
diff --git a/trunk/include/linux/pci-acpi.h b/trunk/include/linux/pci-acpi.h
index 4877e35ae202..936ef82ed76a 100644
--- a/trunk/include/linux/pci-acpi.h
+++ b/trunk/include/linux/pci-acpi.h
@@ -50,7 +50,7 @@
 extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
 extern acpi_status pci_osc_support_set(u32 flags);
 #else
-#if !defined(acpi_status)
+#if !defined(AE_ERROR)
 typedef u32 		acpi_status;
 #define AE_ERROR      	(acpi_status) (0x0001)
 #endif    
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 440a733fe2e9..4649a63a8cb6 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -1061,7 +1061,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, unsigned long nr_pages,
 loop_again:
 	total_scanned = 0;
 	nr_reclaimed = 0;
-	sc.may_writepage = !laptop_mode;
+	sc.may_writepage = !laptop_mode,
 	sc.nr_mapped = read_page_state(nr_mapped);
 
 	inc_page_state(pageoutrun);