mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branches 'at91', 'imx', 'iop', 'ixp', 'ks8695', 'misc', 'ns9xxx', 'pxa' and 's3c' into devel
This commit is contained in:
parent
ed54fcfd78
52c543f90c
fe885fa237
5c9b9123b3
3be20cad15
11179d8ca2
26c671c6b7
7bbb18c9f4
06cfa55694
commit
5957a4eb28
157 changed files with 5468 additions and 1146 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue