diff options
| author | James Morris | 2009-06-09 01:27:53 +0200 |
|---|---|---|
| committer | James Morris | 2009-06-09 01:27:53 +0200 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /include/linux/amba/serial.h | |
| parent | integrity: ima audit dentry_open failure (diff) | |
| parent | async: Fix lack of boot-time console due to insufficient synchronization (diff) | |
| download | kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.gz kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/amba/serial.h')
| -rw-r--r-- | include/linux/amba/serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ #define UART01x_FR_MODEM_ANY (UART01x_FR_DCD|UART01x_FR_DSR|UART01x_FR_CTS) #ifndef __ASSEMBLY__ +struct amba_device; /* in uncompress this is included but amba/bus.h is not */ struct amba_pl010_data { void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl); }; |