git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
pci.c
diff --git
a/arch/arm/mach-versatile/pci.c
b/arch/arm/mach-versatile/pci.c
index
722fbab
..
13bbd08
100644
(file)
--- a/
arch/arm/mach-versatile/pci.c
+++ b/
arch/arm/mach-versatile/pci.c
@@
-14,7
+14,6
@@
* 14/04/2005 Initial version, colin.king@philips.com
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/ptrace.h>
@@
-118,7
+117,6
@@
static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh
} else {
switch (size) {
case 1:
- addr &= ~3;
v = __raw_readb(addr);
break;