diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 10:41:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 10:41:37 -0400 |
| commit | 0a15e0b5b9342fd7fb3f40b24872c174b0e402ea (patch) | |
| tree | fcaa440936a09a29d8c7c0329a59a1b673dfcc9e /drivers/block/pktcdvd.c | |
| parent | 60d808ddff97071ee4c3e1d13454642f3d0e8ae1 (diff) | |
| parent | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (diff) | |
Merge tag 'omap-for-v3.11/pm-voltdomain-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
PM voltage domain clean-up via Kevin Hilman <khilman@linaro.org>:
OMAP: PM: remove requirement for voltage domain data; remove dummy data
* tag 'omap-for-v3.11/pm-voltdomain-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: AM33xx: Remove the unused voltagedomain data
ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm associated to a pwrdm
Includes an update to Linux 3.10-rc6.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 3c08983e600a..f5d0ea11d9fd 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -83,7 +83,8 @@ | |||
| 83 | 83 | ||
| 84 | #define MAX_SPEED 0xffff | 84 | #define MAX_SPEED 0xffff |
| 85 | 85 | ||
| 86 | #define ZONE(sector, pd) (((sector) + (pd)->offset) & ~((pd)->settings.size - 1)) | 86 | #define ZONE(sector, pd) (((sector) + (pd)->offset) & \ |
| 87 | ~(sector_t)((pd)->settings.size - 1)) | ||
| 87 | 88 | ||
| 88 | static DEFINE_MUTEX(pktcdvd_mutex); | 89 | static DEFINE_MUTEX(pktcdvd_mutex); |
| 89 | static struct pktcdvd_device *pkt_devs[MAX_WRITERS]; | 90 | static struct pktcdvd_device *pkt_devs[MAX_WRITERS]; |