Changeset 104 for GPL/branches


Ignore:
Timestamp:
May 18, 2007, 6:58:16 AM (18 years ago)
Author:
Brendan Oakley
Message:

Corrected some recent fixes with a better approach.

Location:
GPL/branches/alsa-resync1/alsa-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/core/memalloc.c

    r101 r104  
    2222 */
    2323
     24#include <sound/driver.h>
    2425#include <sound/core.h>
    2526#include <sound/info.h>
    26 #include <linux/module.h>
    2727#include <sound/memalloc.h>
    2828

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

    r103 r104  
    2323 */
    2424
    25 #include <sound/config.h>
    26 #include "compat_22.h"
     25#include <linux/sched.h>                /* wake_up() */
    2726#include <asm/semaphore.h>
    28 
    29 #if defined TARGET_OS2  && !defined __SOUND_LOCAL_DRIVER_H
    30 /* Missing <linux/workqueue.h>, so borrowing work_struct from adriver.h */
    31 struct work_struct {
    32         unsigned long pending;
    33         struct list_head entry;
    34         void (*func)(void *);
    35         void *data;
    36         void *wq_data;
    37         struct timer_list timer;
    38 };
    39 #define INIT_WORK(_work, _func, _data)                  \
    40         do {                                            \
    41                 (_work)->func = _func;                  \
    42                 (_work)->data = _data;                  \
    43                 init_timer(&(_work)->timer);            \
    44         } while (0)
    45 #define __WORK_INITIALIZER(n, f, d) {                   \
    46                 .func = (f),                            \
    47                 .data = (d),                            \
    48         }
    49 #define DECLARE_WORK(n, f, d)                           \
    50         struct work_struct n = __WORK_INITIALIZER(n, f, d)
    51 int snd_compat_schedule_work(struct work_struct *work);
    52 #define schedule_work(w) snd_compat_schedule_work(w)
    53 #endif /* TARGET_OS2 */
    5427
    5528/* Typedef's */
Note: See TracChangeset for help on using the changeset viewer.