Commit fcb7032e authored by Russell King's avatar Russell King

Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-serial
parents 1910e4dc 3c8e39d4
...@@ -49,7 +49,6 @@ struct serial_struct { ...@@ -49,7 +49,6 @@ struct serial_struct {
unsigned short iomem_reg_shift; unsigned short iomem_reg_shift;
unsigned int port_high; unsigned int port_high;
unsigned long iomap_base; /* cookie passed into ioremap */ unsigned long iomap_base; /* cookie passed into ioremap */
int reserved[1];
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment