diff options
| author |   H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:36:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:36:33 -0700 |
| commit | 03c1b4e8e560455a2634a76998883a22f1a01207 (patch) | |
| tree | 30ca1237d094d66df1dc1533f7bf39b3877b5932 /include/linux/mfd/rtsx_common.h | |
| parent | x86, mm: Replace arch_vma_name with vm_ops->name for vsyscalls (diff) | |
| parent | Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix (diff) | |
| download | linux-dev-03c1b4e8e560455a2634a76998883a22f1a01207.tar.xz linux-dev-03c1b4e8e560455a2634a76998883a22f1a01207.zip | |
Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso
Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/mfd/rtsx_common.h')
| -rw-r--r-- | include/linux/mfd/rtsx_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/mfd/rtsx_common.h index 7c36cc55d2c7..443176ee1ab0 100644 --- a/include/linux/mfd/rtsx_common.h +++ b/include/linux/mfd/rtsx_common.h @@ -45,7 +45,6 @@ struct platform_device; struct rtsx_slot { struct platform_device *p_dev; void (*card_event)(struct platform_device *p_dev); - void (*done_transfer)(struct platform_device *p_dev); }; #endif |