aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h5
-rw-r--r--include/linux/errno.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index f62e21689fdd..22d6938ddbb4 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -585,6 +585,10 @@ struct device_dma_parameters {
585 * @mutex: Mutex to synchronize calls to its driver. 585 * @mutex: Mutex to synchronize calls to its driver.
586 * @bus: Type of bus device is on. 586 * @bus: Type of bus device is on.
587 * @driver: Which driver has allocated this 587 * @driver: Which driver has allocated this
588 * @deferred_probe: entry in deferred_probe_list which is used to retry the
589 * binding of drivers which were unable to get all the resources
590 * needed by the device; typically because it depends on another
591 * driver getting probed first.
588 * @platform_data: Platform data specific to the device. 592 * @platform_data: Platform data specific to the device.
589 * Example: For devices on custom boards, as typical of embedded 593 * Example: For devices on custom boards, as typical of embedded
590 * and SOC based hardware, Linux often uses platform_data to point 594 * and SOC based hardware, Linux often uses platform_data to point
@@ -644,6 +648,7 @@ struct device {
644 struct bus_type *bus; /* type of bus device is on */ 648 struct bus_type *bus; /* type of bus device is on */
645 struct device_driver *driver; /* which driver has allocated this 649 struct device_driver *driver; /* which driver has allocated this
646 device */ 650 device */
651 struct list_head deferred_probe;
647 void *platform_data; /* Platform specific data, device 652 void *platform_data; /* Platform specific data, device
648 core doesn't touch it */ 653 core doesn't touch it */
649 struct dev_pm_info power; 654 struct dev_pm_info power;
diff --git a/include/linux/errno.h b/include/linux/errno.h
index 46685832ed99..2d09bfa5c262 100644
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
@@ -16,6 +16,7 @@
16#define ERESTARTNOHAND 514 /* restart if no handler.. */ 16#define ERESTARTNOHAND 514 /* restart if no handler.. */
17#define ENOIOCTLCMD 515 /* No ioctl command */ 17#define ENOIOCTLCMD 515 /* No ioctl command */
18#define ERESTART_RESTARTBLOCK 516 /* restart by calling sys_restart_syscall */ 18#define ERESTART_RESTARTBLOCK 516 /* restart by calling sys_restart_syscall */
19#define EPROBE_DEFER 517 /* Driver requests probe retry */
19 20
20/* Defined for the NFSv3 protocol */ 21/* Defined for the NFSv3 protocol */
21#define EBADHANDLE 521 /* Illegal NFS file handle */ 22#define EBADHANDLE 521 /* Illegal NFS file handle */