diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
| commit | 3b38f317e529d8396377dafc7d95a1451a151df5 (patch) | |
| tree | 65e80799417c456bdd907b7d80182732be02e5f4 /include/linux/firmware.h | |
| parent | 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 (diff) | |
| parent | 353b28bafd1b962359a866ff263a7fad833d29a1 (diff) | |
| download | talos-obmc-linux-3b38f317e529d8396377dafc7d95a1451a151df5.tar.gz talos-obmc-linux-3b38f317e529d8396377dafc7d95a1451a151df5.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/firmware.h')
| -rw-r--r-- | include/linux/firmware.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 2d716080be4a..33d8f2087b6e 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -19,5 +19,4 @@ int request_firmware_nowait( void (*cont)(const struct firmware *fw, void *context)); void release_firmware(const struct firmware *fw); -void register_firmware(const char *name, const u8 *data, size_t size); #endif |
