Merge branch 'for-2.6.33' into for-2.6.34

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c
index ae0352ecd5a9..bf7e6c27e318 100644
--- a/arch/microblaze/kernel/prom_parse.c
+++ b/arch/microblaze/kernel/prom_parse.c
@@ -256,7 +256,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
                 if (ppdev == NULL) {
                         struct pci_controller *host;
                         host = pci_bus_to_host(pdev->bus);
-                        ppnode = host ? host->arch_data : NULL;
+                        ppnode = host ? host->dn : NULL;
                         /* No node for host bridge ? give up */
                         if (ppnode == NULL)
                                 return -EINVAL;
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 4088be7d4e29..03376dc814c9 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -366,7 +366,7 @@ ENTRY(sys_call_table)
         .long sys_shutdown
         .long sys_sendmsg               /* 360 */
         .long sys_recvmsg
-        .long sys_ni_syscall
+        .long sys_accept4
         .long sys_ni_syscall
         .long sys_ni_syscall
         .long sys_rt_tgsigqueueinfo     /* 365 */