hdsp.c code

[Orm Finnendahl <finnendahl@folkwang-hochschule.de>]

Hi,

In the current cvs checkpout of hdsp.c code there seem to be some
leftovers starting line 2874:

<...>
                } else {
                       hdsp->type = Digiface;
<<<<<<< hdsp.c
                        hdsp->card_name = "RME Hammerfall DSP (Digiface)";
                                          hdsp->ss_channels = DIGIFACE_SS_CHANNELS;
                                                              hdsp->ds_channels = DIGIFACE_DS_CHANNELS;
=======
>>>>>>> 1.10
                } 

                  hdsp_write (hdsp, HDSP_jtagReg, HDSP_S_PROGRAM);
<...>


I just got rid of the offending lines and hope that's o.k.

--
Orm


-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone?  Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390