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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
pcmcia
/
au1000_db1x00.c
diff --git
a/drivers/pcmcia/au1000_db1x00.c
b/drivers/pcmcia/au1000_db1x00.c
index
abc13f2
..
74e0515
100644
(file)
--- a/
drivers/pcmcia/au1000_db1x00.c
+++ b/
drivers/pcmcia/au1000_db1x00.c
@@
-30,7
+30,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-296,7
+295,7
@@
struct pcmcia_low_level db1x00_pcmcia_ops = {
.socket_suspend = db1x00_socket_suspend
};
.socket_suspend = db1x00_socket_suspend
};
-int
__init
au1x_board_init(struct device *dev)
+int au1x_board_init(struct device *dev)
{
int ret = -ENODEV;
bcsr->pcmcia = 0; /* turn off power, if it's not already off */
{
int ret = -ENODEV;
bcsr->pcmcia = 0; /* turn off power, if it's not already off */