diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-16 02:34:41 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-16 02:34:41 +0100 |
| commit | 38f1cff0863809587b5fd10ecd0c24c8b543a48c (patch) | |
| tree | 7cf6eb88cdc938c3683209d38311e711a1119400 /drivers/isdn/hardware | |
| parent | drm: Retry i2c transfer of EDID block after failure (diff) | |
| parent | drm/radeon: fix problem with changing active VRAM size. (v2) (diff) | |
| download | linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.tar.xz linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.zip | |
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.
Also fixes a trivial nouveau merge.
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/eicon/istream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/eicon/istream.c b/drivers/isdn/hardware/eicon/istream.c index 18f8798442fa..7bd5baa547be 100644 --- a/drivers/isdn/hardware/eicon/istream.c +++ b/drivers/isdn/hardware/eicon/istream.c @@ -62,7 +62,7 @@ void diva_xdi_provide_istream_info (ADAPTER* a, stream interface. If synchronous service was requested, then function does return amount of data written to stream. - 'final' does indicate that pice of data to be written is + 'final' does indicate that piece of data to be written is final part of frame (necessary only by structured datatransfer) return 0 if zero lengh packet was written return -1 if stream is full |