mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
This commit is contained in:
commit
f222e8b40f
1975 changed files with 52429 additions and 30967 deletions
|
|
@ -45,6 +45,7 @@
|
|||
#include <linux/capability.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/socket.h>
|
||||
#include <linux/sockios.h>
|
||||
#include <linux/init.h>
|
||||
|
|
|
|||
|
|
@ -241,7 +241,6 @@
|
|||
#include <linux/module.h>
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/proc_fs.h>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
* 2) as a control channel (write commands, read events)
|
||||
*/
|
||||
|
||||
#include <linux/smp_lock.h>
|
||||
#include "irnet_ppp.h" /* Private header */
|
||||
/* Please put other headers in irnet.h - Thanks */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue