diff options
| author |   Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 20:12:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 20:12:45 +0200 |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /arch/arm/mach-shmobile/include/mach/sh7372.h | |
| parent | ARM: mach-shmobile: sh7372 sleep warning fixes (diff) | |
| parent | PM / Clocks: Do not acquire a mutex under a spinlock (diff) | |
| download | linux-dev-0d41da2e31e81f5c8aaabe17f769de4304b2d4c8.tar.xz linux-dev-0d41da2e31e81f5c8aaabe17f769de4304b2d4c8.zip | |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.
Conflicts:
drivers/base/power/clock_ops.c
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/sh7372.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh7372.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h index 713cd2111e85..efc984c4cef3 100644 --- a/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -459,6 +459,10 @@ enum { SHDMA_SLAVE_SDHI2_TX, SHDMA_SLAVE_MMCIF_RX, SHDMA_SLAVE_MMCIF_TX, + SHDMA_SLAVE_USB0_TX, + SHDMA_SLAVE_USB0_RX, + SHDMA_SLAVE_USB1_TX, + SHDMA_SLAVE_USB1_RX, }; extern struct clk sh7372_extal1_clk; |