Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00
parent e8765afe54 667f390bee a35d4e5873 4d5336d50a 041f10d46f be20902ba6
commit 4b60e5f90d
162 changed files with 412 additions and 10652 deletions
@@ -22,7 +22,9 @@ struct map_info;

 struct physmap_flash_data {
 	unsigned int		width;
-	void			(*set_vpp)(struct map_info *, int);
+	int			(*init)(struct platform_device *);
+	void			(*exit)(struct platform_device *);
+	void			(*set_vpp)(struct platform_device *, int);
 	unsigned int		nr_parts;
 	unsigned int		pfow_base;
 	char                    *probe_type;