diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2006-03-25 03:08:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:23:01 -0800 |
| commit | 06842415149371127b91d15774cff95dcccc1845 (patch) | |
| tree | ab613c84d1bb2cfab6ac090aa351c5ba7addfa02 /Documentation/firmware_class | |
| parent | d12ddde2bbf46b34eae3fb3fd36c0e42832b537c (diff) | |
| download | linux-06842415149371127b91d15774cff95dcccc1845.tar.gz linux-06842415149371127b91d15774cff95dcccc1845.tar.bz2 linux-06842415149371127b91d15774cff95dcccc1845.zip | |
[PATCH] Doc: fix example firmware source code
Fix Documentation/firmware_class/ examples so that they will build.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/firmware_class')
| -rw-r--r-- | Documentation/firmware_class/firmware_sample_driver.c | 3 | ||||
| -rw-r--r-- | Documentation/firmware_class/firmware_sample_firmware_class.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c index d3ad2c24490a..ad3edaba4533 100644 --- a/Documentation/firmware_class/firmware_sample_driver.c +++ b/Documentation/firmware_class/firmware_sample_driver.c @@ -23,7 +23,6 @@ char __init inkernel_firmware[] = "let's say that this is firmware\n"; #endif static struct device ghost_device = { - .name = "Ghost Device", .bus_id = "ghost0", }; @@ -92,7 +91,7 @@ static void sample_probe_async(void) { /* Let's say that I can't sleep */ int error; - error = request_firmware_nowait (THIS_MODULE, + error = request_firmware_nowait (THIS_MODULE, FW_ACTION_NOHOTPLUG, "sample_driver_fw", &ghost_device, "my device pointer", sample_probe_async_cont); diff --git a/Documentation/firmware_class/firmware_sample_firmware_class.c b/Documentation/firmware_class/firmware_sample_firmware_class.c index 57b956aecbc5..9e1b0e4051cd 100644 --- a/Documentation/firmware_class/firmware_sample_firmware_class.c +++ b/Documentation/firmware_class/firmware_sample_firmware_class.c @@ -172,7 +172,6 @@ static void fw_remove_class_device(struct class_device *class_dev) static struct class_device *class_dev; static struct device my_device = { - .name = "Sample Device", .bus_id = "my_dev0", }; |