diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/ieee1394 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 2cd00b5b45b..9fd4a0d3206 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -125,7 +125,7 @@ | |||
| 125 | 0 - no debugging messages | 125 | 0 - no debugging messages |
| 126 | 1 - some debugging messages, but none during DMA frame transmission | 126 | 1 - some debugging messages, but none during DMA frame transmission |
| 127 | 2 - lots of messages, including during DMA frame transmission | 127 | 2 - lots of messages, including during DMA frame transmission |
| 128 | (will cause undeflows if your machine is too slow!) | 128 | (will cause underflows if your machine is too slow!) |
| 129 | */ | 129 | */ |
| 130 | 130 | ||
| 131 | #define DV1394_DEBUG_LEVEL 0 | 131 | #define DV1394_DEBUG_LEVEL 0 |