Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

1 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 3fdc10806d3..42767d1a62e 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -99,4 +99,15 @@ enum mem_add_context { BOOT, HOTPLUG };
 #define hotplug_memory_notifier(fn, pri) do { } while (0)
 #endif
 
+/*
+ * 'struct memory_accessor' is a generic interface to provide
+ * in-kernel access to persistent memory such as i2c or SPI EEPROMs
+ */
+struct memory_accessor {
+        ssize_t (*read)(struct memory_accessor *, char *buf, off_t offset,
+                        size_t count);
+        ssize_t (*write)(struct memory_accessor *, const char *buf,
+                         off_t offset, size_t count);
+};
+
 #endif /* _LINUX_MEMORY_H_ */