git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
prom.c
diff --git
a/arch/ppc/syslib/prom.c
b/arch/ppc/syslib/prom.c
index
1b23f1e
..
1ddb0c0
100644
(file)
--- a/
arch/ppc/syslib/prom.c
+++ b/
arch/ppc/syslib/prom.c
@@
-19,7
+19,6
@@
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/bitops.h>
#include <asm/sections.h>
#include <asm/prom.h>
#include <asm/sections.h>
#include <asm/prom.h>
@@
-32,6
+31,7
@@
#include <asm/system.h>
#include <asm/mmu.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/mmu.h>
#include <asm/pgtable.h>
+#include <asm/bitops.h>
#include <asm/bootinfo.h>
#include <asm/btext.h>
#include <asm/pci-bridge.h>
#include <asm/bootinfo.h>
#include <asm/btext.h>
#include <asm/pci-bridge.h>