diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:03 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:58 +0100 |
commit | 2e3d4de1bd80b2f205aab0ed0a25daef464ab91c (patch) | |
tree | 7caa6a353f9ff9f5e196ed01bbbfce1c8c5ec8ae /arch/arm/mach-shmobile/clock-r8a7790.c | |
parent | ALSA: i2sbus: Deletion of unnecessary checks before the function call "release_and_free_resource" (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | linux-dev-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.tar.xz linux-dev-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.zip |
Merge tag 'v3.18-rc7' into for-next
... for allowing more cleanups of hda_intel.c driver-caps where both
upstream and for-next contain the changes.
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7790.c')
-rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7790.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index 126ddafad526..f62265200592 100644 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@ -68,7 +68,7 @@ #define SDCKCR 0xE6150074 #define SD2CKCR 0xE6150078 -#define SD3CKCR 0xE615007C +#define SD3CKCR 0xE615026C #define MMC0CKCR 0xE6150240 #define MMC1CKCR 0xE6150244 #define SSPCKCR 0xE6150248 |