Merge branches 'at91', 'imx', 'iop', 'ixp', 'ks8695', 'misc', 'ns9xxx', 'pxa' and 's3c' into devel

This commit is contained in:
Russell King 2007-07-22 17:09:17 +01:00 • committed by Russell King
157 changed files with 5468 additions and 1146 deletions

View file

@ -1114,8 +1114,8 @@ static int __init imx_serial_init(void)
static void __exit imx_serial_exit(void)
{
uart_unregister_driver(&imx_reg);
platform_driver_unregister(&serial_imx_driver);
uart_unregister_driver(&imx_reg);
}
module_init(imx_serial_init);

View file

@ -78,7 +78,7 @@
#include <asm/hardware.h>
#include <asm/arch/regs-serial.h>
#include <asm/plat-s3c/regs-serial.h>
#include <asm/arch/regs-gpio.h>
/* structures */