Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h
index 5c92ebbe7d9e..571d6b90d206 100644
--- a/drivers/serial/samsung.h
+++ b/drivers/serial/samsung.h
@@ -33,12 +33,21 @@ struct s3c24xx_uart_info {
 struct s3c24xx_uart_port {
         unsigned char                   rx_claimed;
         unsigned char                   tx_claimed;
+        unsigned int                    pm_level;
+        unsigned long                   baudclk_rate;
+
+        unsigned int                    rx_irq;
+        unsigned int                    tx_irq;
 
         struct s3c24xx_uart_info        *info;
         struct s3c24xx_uart_clksrc      *clksrc;
         struct clk                      *clk;
         struct clk                      *baudclk;
         struct uart_port                port;
+
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block           freq_transition;
+#endif
 };
 
 /* conversion functions */