Merge branch 'for-next/misc'

2 files changed, 5 insertions, 6 deletions

diff --git a/include/envfs.h b/include/envfs.h
index 27c4b42c6b..c8fc3759c6 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -93,8 +93,13 @@ struct envfs_super {
 #endif
 
 #define ENV_FLAG_NO_OVERWRITE	(1 << 0)
+#define PAD4(x) ((x + 3) & ~3)
 int envfs_load(const char *filename, const char *dirname, unsigned flags);
 int envfs_save(const char *filename, const char *dirname, unsigned flags);
+int envfs_check_super(struct envfs_super *super, size_t *size);
+int envfs_check_data(struct envfs_super *super, const void *buf, size_t size);
+int envfs_load_data(struct envfs_super *super, void *buf, size_t size,
+		const char *dir, unsigned flags);
 int envfs_load_from_buf(void *buf, int len, const char *dir, unsigned flags);
 
 /* defaults to /dev/env0 */
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 2ecef35a40..7b3e603322 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -90,12 +90,6 @@ amba_ahb_device_add(struct device_d *parent, const char *name, int id,
 				    periphid);
 }
 
-
-void amba_device_unregister(struct amba_device *);
-struct amba_device *amba_find_device(const char *, struct device_d *, unsigned int, unsigned int);
-int amba_request_regions(struct amba_device *, const char *);
-void amba_release_regions(struct amba_device *);
-
 static inline void __iomem *amba_get_mem_region(struct amba_device *dev)
 {
 	return dev->base;