Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / media / dvb / mantis / mantis_uart.h

diff --git a/drivers/media/dvb/mantis/mantis_uart.h b/drivers/media/dvb/mantis/mantis_uart.h
index e9f938d37c3a610e1d4e9e151d43cf872bfa3804..ffb62a0a5a1319c60fb353d575caa2df0b86ff16 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_uart.h
+++ b/drivers/media/dvb/mantis/mantis_uart.h
@@ -1,7 +1,7 @@
 /*
        Mantis PCI bridge driver
 
-       Copyright (C) 2005, 2006 Manu Abraham (abraham.manu@gmail.com)
+       Copyright (C) Manu Abraham (abraham.manu@gmail.com)
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -45,10 +45,9 @@ enum mantis_baud {
 };
 
 enum mantis_parity {
-       MANTIS_PARITY_UNDEFINED = 0,
+       MANTIS_PARITY_NONE      = 0,
        MANTIS_PARITY_EVEN,
        MANTIS_PARITY_ODD,
-       MANTIS_PARITY_NONE
 };
 
 struct mantis_pci;
@@ -56,4 +55,4 @@ struct mantis_pci;
 extern int mantis_uart_init(struct mantis_pci *mantis);
 extern void mantis_uart_exit(struct mantis_pci *mantis);
 
-#endif // __MANTIS_UART_H
+#endif /* __MANTIS_UART_H */