[alsa-devel] [PATCH 4/4] ALSA: snd-usb: move code from urb.c to endpoint.c

[Daniel Mack]

On Wed, Sep 14, 2011 at 11:44 AM, Takashi Iwai <tiwai at suse.de> wrote:
> At Mon, 12 Sep 2011 18:54:13 +0200,
> Daniel Mack wrote:
>>
>> No code altered at this point, simply preparing for upcoming
>> refactorizations.
>>
>> Signed-off-by: Daniel Mack <zonque at gmail.com>
>> ---
>>  sound/usb/Makefile   |    3 +-
>>  sound/usb/card.c     |    1 -
>>  sound/usb/endpoint.c |  924 +++++++++++++++++++++++++++++++++++++++++++++++++
>>  sound/usb/endpoint.h |   17 +
>>  sound/usb/pcm.c      |    2 +-
>>  sound/usb/stream.c   |    1 -
>>  sound/usb/urb.c      |  941 --------------------------------------------------
>>  sound/usb/urb.h      |   21 --
>>  8 files changed, 943 insertions(+), 967 deletions(-)
>>  delete mode 100644 sound/usb/urb.c
>>  delete mode 100644 sound/usb/urb.h
>
> This patch wasn't applied cleanly to my tree.  urb.c was rejected.
> Could you refresh the patches based on the latest sound git tree?
>   git://github.com/tiwai/sound.git
>
> The branch topic/misc should contain the latest status for USB.

Ah, the reason for the conflict is that Pierre-Louis Bossart's delay
information patch was merged before mine. New version coming up.

If that's easier, you can also pull from

  git://github.com/zonque/linux-2.6.git usb-audio


Daniel