diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /arch/sh/include/cpu-sh4/cpu/sh7724.h | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/sh7724.h')
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sh7724.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h index 3daef8ecbc63..cbc47e6bcab5 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7724.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h | |||
| @@ -298,6 +298,14 @@ enum { | |||
| 298 | SHDMA_SLAVE_SCIF4_RX, | 298 | SHDMA_SLAVE_SCIF4_RX, |
| 299 | SHDMA_SLAVE_SCIF5_TX, | 299 | SHDMA_SLAVE_SCIF5_TX, |
| 300 | SHDMA_SLAVE_SCIF5_RX, | 300 | SHDMA_SLAVE_SCIF5_RX, |
| 301 | SHDMA_SLAVE_USB0D0_TX, | ||
| 302 | SHDMA_SLAVE_USB0D0_RX, | ||
| 303 | SHDMA_SLAVE_USB0D1_TX, | ||
| 304 | SHDMA_SLAVE_USB0D1_RX, | ||
| 305 | SHDMA_SLAVE_USB1D0_TX, | ||
| 306 | SHDMA_SLAVE_USB1D0_RX, | ||
| 307 | SHDMA_SLAVE_USB1D1_TX, | ||
| 308 | SHDMA_SLAVE_USB1D1_RX, | ||
| 301 | SHDMA_SLAVE_SDHI0_TX, | 309 | SHDMA_SLAVE_SDHI0_TX, |
| 302 | SHDMA_SLAVE_SDHI0_RX, | 310 | SHDMA_SLAVE_SDHI0_RX, |
| 303 | SHDMA_SLAVE_SDHI1_TX, | 311 | SHDMA_SLAVE_SDHI1_TX, |