diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /include/linux/amba/bus.h | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'include/linux/amba/bus.h')
| -rw-r--r-- | include/linux/amba/bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 51e6e54b2aa1..9b93cafa82a0 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h | |||
| @@ -28,7 +28,7 @@ struct amba_id { | |||
| 28 | 28 | ||
| 29 | struct amba_driver { | 29 | struct amba_driver { |
| 30 | struct device_driver drv; | 30 | struct device_driver drv; |
| 31 | int (*probe)(struct amba_device *, void *); | 31 | int (*probe)(struct amba_device *, struct amba_id *); |
| 32 | int (*remove)(struct amba_device *); | 32 | int (*remove)(struct amba_device *); |
| 33 | void (*shutdown)(struct amba_device *); | 33 | void (*shutdown)(struct amba_device *); |
| 34 | int (*suspend)(struct amba_device *, pm_message_t); | 34 | int (*suspend)(struct amba_device *, pm_message_t); |