From cd17804727e5fcf21bb7a3142ad22a4c7e8295dc Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 25 Mar 2006 03:08:21 -0800 Subject: [PATCH] --- yaml --- r: 23610 b: refs/heads/master c: 06842415149371127b91d15774cff95dcccc1845 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/firmware_class/firmware_sample_driver.c | 3 +-- .../firmware_class/firmware_sample_firmware_class.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9621504e29d5..2219ab1d2e2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d12ddde2bbf46b34eae3fb3fd36c0e42832b537c +refs/heads/master: 06842415149371127b91d15774cff95dcccc1845 diff --git a/trunk/Documentation/firmware_class/firmware_sample_driver.c b/trunk/Documentation/firmware_class/firmware_sample_driver.c index d3ad2c24490a..ad3edaba4533 100644 --- a/trunk/Documentation/firmware_class/firmware_sample_driver.c +++ b/trunk/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/trunk/Documentation/firmware_class/firmware_sample_firmware_class.c b/trunk/Documentation/firmware_class/firmware_sample_firmware_class.c index 57b956aecbc5..9e1b0e4051cd 100644 --- a/trunk/Documentation/firmware_class/firmware_sample_firmware_class.c +++ b/trunk/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", };