From: Randy Dunlap <[email protected]>
Fix Documentation/firmware_class/ examples so that they will build.
Signed-off-by: Randy Dunlap <[email protected]>
---
Documentation/firmware_class/firmware_sample_driver.c | 3 +--
Documentation/firmware_class/firmware_sample_firmware_class.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
--- linux-2616-work.orig/Documentation/firmware_class/firmware_sample_driver.c
+++ linux-2616-work/Documentation/firmware_class/firmware_sample_driver.c
@@ -23,7 +23,6 @@ char __init inkernel_firmware[] = "let's
#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);
--- linux-2616-work.orig/Documentation/firmware_class/firmware_sample_firmware_class.c
+++ linux-2616-work/Documentation/firmware_class/firmware_sample_firmware_class.c
@@ -172,7 +172,6 @@ static void fw_remove_class_device(struc
static struct class_device *class_dev;
static struct device my_device = {
- .name = "Sample Device",
.bus_id = "my_dev0",
};
---