Merge branch 'linus' into x86/apic-cleanups

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 62895a719fcb..22dbd91811a4 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -435,7 +435,7 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
         struct hpi_message hm;
         struct hpi_response hr;
         struct hpi_adapter *pa;
-        pa = (struct hpi_adapter *)pci_get_drvdata(pci_dev);
+        pa = pci_get_drvdata(pci_dev);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_DELETE_ADAPTER);