aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 14:25:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-12 14:25:10 -0700
commite328f05dd6c528fcc9eb6da157dd865dfe611352 (patch)
treec2bfbdada67dd80a8eed5aeafbe0d7322b1c1b2a /include/linux/platform_device.h
parent0d88f6e804c824454b5ed0d3034ed3dcf7467a87 (diff)
parente710d7d5a9cab1041b7a3cf9e655b75d92786857 (diff)
downloadkernel_replicant_linux-e328f05dd6c528fcc9eb6da157dd865dfe611352.tar.gz
kernel_replicant_linux-e328f05dd6c528fcc9eb6da157dd865dfe611352.tar.bz2
kernel_replicant_linux-e328f05dd6c528fcc9eb6da157dd865dfe611352.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Fetch cell pointer from platform_device->mfd_cell
Diffstat (limited to 'include/linux/platform_device.h')
-rw-r--r--include/linux/platform_device.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index d96db9825708..744942c95fec 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -14,6 +14,8 @@
#include <linux/device.h>
#include <linux/mod_devicetable.h>
+struct mfd_cell;
+
struct platform_device {
const char * name;
int id;
@@ -23,6 +25,9 @@ struct platform_device {
const struct platform_device_id *id_entry;
+ /* MFD cell pointer */
+ struct mfd_cell *mfd_cell;
+
/* arch specific additions */
struct pdev_archdata archdata;
};