Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 5 deletions

diff --git a/sound/pci/asihpi/hpi6205.h b/sound/pci/asihpi/hpi6205.h
index 1adae0857cda..df2f02c0c7b4 100644
--- a/sound/pci/asihpi/hpi6205.h
+++ b/sound/pci/asihpi/hpi6205.h
@@ -25,9 +25,6 @@ Copyright AudioScience, Inc., 2003
 #ifndef _HPI6205_H_
 #define _HPI6205_H_
 
-/* transitional conditional compile shared between host and DSP */
-/* #define HPI6205_NO_HSR_POLL */
-
 #include "hpi_internal.h"
 
 /***********************************************************
@@ -78,8 +75,8 @@ struct bus_master_interface {
         u32 dsp_ack;
         u32 transfer_size_in_bytes;
         union {
-                struct hpi_message message_buffer;
-                struct hpi_response response_buffer;
+                struct hpi_message_header message_buffer;
+                struct hpi_response_header response_buffer;
                 u8 b_data[HPI6205_SIZEOF_DATA];
         } u;
         struct controlcache_6205 control_cache;