Merge branch 'linus' into x86/kconfig

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / csr.h

diff --git a/drivers/ieee1394/csr.h b/drivers/ieee1394/csr.h
index 2bc080f76510ba69a76f32515df01bd9db341f21..f11546550d84efa01bfdf03f127d50e467dc2820 100644 (file)
--- a/drivers/ieee1394/csr.h
+++ b/drivers/ieee1394/csr.h
@@ -91,4 +91,9 @@ extern struct csr1212_bus_ops csr_bus_ops;
 int init_csr(void);
 void cleanup_csr(void);
 
+/* hpsb_update_config_rom() is deprecated */
+struct hpsb_host;
+int hpsb_update_config_rom(struct hpsb_host *host, const quadlet_t *new_rom,
+                          size_t size, unsigned char rom_version);
+
 #endif /* _IEEE1394_CSR_H */