diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-20 01:24:03 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-20 01:24:03 +0400 |
| commit | b41fb43911b4cb864812adec88d028cc6219f23e (patch) | |
| tree | f383de554dc3640ec3081ad41fa34f7cab68de82 /drivers/gpu/drm/radeon/r600d.h | |
| parent | 0963d59bc0bbed48b06733950f5eb167e9b9a8fa (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| download | linux-b41fb43911b4cb864812adec88d028cc6219f23e.tar.xz | |
Merge tag 'v3.12-rc6' into devel
Linux 3.12-rc6
Conflicts:
drivers/gpio/gpio-lynxpoint.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r600d.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h index e673fe26ea84..7b3c7b5932c5 100644 --- a/drivers/gpu/drm/radeon/r600d.h +++ b/drivers/gpu/drm/radeon/r600d.h @@ -1523,7 +1523,7 @@ */ # define PACKET3_CP_DMA_CP_SYNC (1 << 31) /* COMMAND */ -# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) +# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) /* 0 - none * 1 - 8 in 16 * 2 - 8 in 32 |