projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../scsi-misc-2.6
[powerpc.git]
/
drivers
/
pcmcia
/
sa1111_generic.c
diff --git
a/drivers/pcmcia/sa1111_generic.c
b/drivers/pcmcia/sa1111_generic.c
index
bb90a14
..
658cddf
100644
(file)
--- a/
drivers/pcmcia/sa1111_generic.c
+++ b/
drivers/pcmcia/sa1111_generic.c
@@
-5,7
+5,6
@@
* basically means we handle everything except controlling the
* power. Power is machine specific...
*/
* basically means we handle everything except controlling the
* power. Power is machine specific...
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/ioport.h>
@@
-122,7
+121,7
@@
void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
static int pcmcia_probe(struct sa1111_dev *dev)
{
static int pcmcia_probe(struct sa1111_dev *dev)
{
-
char
*base;
+
void __iomem
*base;
if (!request_mem_region(dev->res.start, 512,
SA1111_DRIVER_NAME(dev)))
if (!request_mem_region(dev->res.start, 512,
SA1111_DRIVER_NAME(dev)))