diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-19 21:25:27 +0100 |
| commit | 87af0b80c933f05a4c7dd8c5edebe10365e76220 (patch) | |
| tree | 6c33ab1a47b5f1ef196e8847586fb81b17152a0e /fs/xfs/xfs_alloc.h | |
| parent | 08a978db518dfceb37998bc74a7fed03540cfd08 (diff) | |
| parent | 2ea3c6a2c779e5a6487d2b436770232162dfbbe3 (diff) | |
Merge branch 'for-linus' into for-next
Merge the recent HD-audio codec change for fixing recursive suspend
calls.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'fs/xfs/xfs_alloc.h')
| -rw-r--r-- | fs/xfs/xfs_alloc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/xfs/xfs_alloc.h b/fs/xfs/xfs_alloc.h index 93be4a667ca..feacb061bab 100644 --- a/fs/xfs/xfs_alloc.h +++ b/fs/xfs/xfs_alloc.h @@ -120,9 +120,6 @@ typedef struct xfs_alloc_arg { char isfl; /* set if is freelist blocks - !acctg */ char userdata; /* set if this is user data */ xfs_fsblock_t firstblock; /* io first block allocated */ - struct completion *done; - struct work_struct work; - int result; } xfs_alloc_arg_t; /* |