summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-08 08:29:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-08 08:29:31 -0700
commit6025974bab1c3da8662df79bdeb694588bc3eb93 (patch)
tree27a8fbd7544f7ddcedee541954ab2af04338db4a /include
parent33fa108ed1fa46a53a99dd853bdec7c8eaed4732 (diff)
parentaa853f85d9ed593672d0f24a98c72a2518cb63e6 (diff)
downloadlinux-3.10-6025974bab1c3da8662df79bdeb694588bc3eb93.tar.gz
linux-3.10-6025974bab1c3da8662df79bdeb694588bc3eb93.tar.bz2
linux-3.10-6025974bab1c3da8662df79bdeb694588bc3eb93.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5543/1: arm: serial amba: add missing declaration in serial.h [ARM] pxa: fix pxa27x_udc default pullup GPIO [ARM] pxa/imote2: fix UCAM sensor board ADC model number mx[23]: don't put clock lookups in __initdata fix oops when using console=ttymxcN with N > 0 [ARM] ARMv7 errata: only apply fixes when running on applicable CPU [ARM] 5534/1: kmalloc must return a cache line aligned buffer
Diffstat (limited to 'include')
-rw-r--r--include/linux/amba/serial.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index 48ee32a18ac..64a982ea5d5 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);
};