diff --git a/[refs] b/[refs] index 8f1e16c222e2..1a63f438a282 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c15768bb0c346767eb54e01a7e772041f36eb65e +refs/heads/master: 1be9bbddde32a0c414dd65220ca86f808aaeec5f diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.h b/trunk/drivers/staging/ipack/devices/ipoctal.h index 2aae170de613..c5b4ed46516f 100644 --- a/trunk/drivers/staging/ipack/devices/ipoctal.h +++ b/trunk/drivers/staging/ipack/devices/ipoctal.h @@ -19,15 +19,6 @@ #define MAX_DEVICES (NR_CHANNELS * IPOCTAL_MAX_BOARDS) #define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) -/** - * enum uart_parity_e - UART supported parity. - */ -enum uart_parity_e { - UART_NONE = 0, - UART_ODD = 1, - UART_EVEN = 2, -}; - /** * struct ipoctal_stats -- Stats since last reset *