Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90fcf31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Use "is_power_of_2" macro for simplicity.
  [SPARC]: Remove duplicate includes.
parents c5b875e3 6f78a197

arch/sparc/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/linkage.h>

#include <linux/kernel_stat.h>

#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/slab.h>

#include <linux/random.h>

arch/sparc64/kernel/ds.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/sched.h>

arch/sparc64/kernel/module.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/fs.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>



#include <asm/processor.h>

arch/sparc64/kernel/sys_sparc32.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <linux/vfs.h>

#include <linux/netfilter_ipv4/ip_tables.h>

#include <linux/ptrace.h>

#include <linux/highuid.h>



#include <asm/types.h>

#include <asm/uaccess.h>

arch/sparc64/kernel/sys_sunos32.c

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include <linux/personality.h>



/* For SOCKET_I */

#include <linux/socket.h>

#include <net/sock.h>

#include <net/compat.h>