diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-20 12:10:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-20 12:10:09 +0100 |
| commit | eefad7fd53eae2eb8d1e205b1d3a18f67e4e6b46 (patch) | |
| tree | 497ef1a21d90c63ac2e4ca6389c0844d0d72b0a8 /include/linux/memory.h | |
| parent | b9ecc4ee28a5ff5b3997da247cd9df1320c602a9 (diff) | |
| parent | ac9ef6cf9196107115930e9fc66207199ef395b3 (diff) | |
Merge branch 'topic/convert-bint' into topic/hda
Merge the conversions to bint module option type.
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index 935699b30b7c..1ac7f6e405f9 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -15,7 +15,6 @@ #ifndef _LINUX_MEMORY_H_ #define _LINUX_MEMORY_H_ -#include <linux/sysdev.h> #include <linux/node.h> #include <linux/compiler.h> #include <linux/mutex.h> @@ -38,7 +37,7 @@ struct memory_block { int phys_device; /* to which fru does this belong? */ void *hw; /* optional pointer to fw/hw data */ int (*phys_callback)(struct memory_block *); - struct sys_device sysdev; + struct device dev; }; int arch_get_memory_phys_device(unsigned long start_pfn); |