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

Commit 4fd5f826 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel 

Manual #include fixups for clashes - there may be some unnecessary
parents eb16292b 8576762f

arch/arm/common/locomo.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/ioport.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

arch/arm/common/sa1111.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/ptrace.h>

#include <linux/errno.h>

#include <linux/ioport.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/dma-mapping.h>

arch/arm/common/scoop.c

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 


#include <linux/device.h>

#include <linux/string.h>

#include <linux/slab.h>



#include <linux/platform_device.h>

#include <asm/io.h>

#include <asm/hardware/scoop.h>

arch/arm/mach-aaec2000/core.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/list.h>

#include <linux/errno.h>

#include <linux/dma-mapping.h>

arch/arm/mach-h720x/h7202-eval.c

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

#include <linux/types.h>

#include <linux/string.h>

#include <linux/device.h>

#include <linux/platform_device.h>



#include <asm/setup.h>

#include <asm/types.h>