diff options
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/bus.h | 2 | ||||
| -rw-r--r-- | include/linux/amba/serial.h | 1 |
2 files changed, 2 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); |
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 48ee32a18ac5..64a982ea5d5f 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h | |||
| @@ -159,6 +159,7 @@ | |||
| 159 | #define UART01x_FR_MODEM_ANY (UART01x_FR_DCD|UART01x_FR_DSR|UART01x_FR_CTS) | 159 | #define UART01x_FR_MODEM_ANY (UART01x_FR_DCD|UART01x_FR_DSR|UART01x_FR_CTS) |
| 160 | 160 | ||
| 161 | #ifndef __ASSEMBLY__ | 161 | #ifndef __ASSEMBLY__ |
| 162 | struct amba_device; /* in uncompress this is included but amba/bus.h is not */ | ||
| 162 | struct amba_pl010_data { | 163 | struct amba_pl010_data { |
| 163 | void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl); | 164 | void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl); |
| 164 | }; | 165 | }; |
