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 'omap-boards' into omap-for-linus
[pandora-kernel.git]
/
drivers
/
staging
/
dt3155
/
dt3155_drv.c
diff --git
a/drivers/staging/dt3155/dt3155_drv.c
b/drivers/staging/dt3155/dt3155_drv.c
index
a67c622
..
7ac2c6d
100644
(file)
--- a/
drivers/staging/dt3155/dt3155_drv.c
+++ b/
drivers/staging/dt3155/dt3155_drv.c
@@
-57,19
+57,8
@@
MA 02111-1307 USA
extern void printques(int);
extern void printques(int);
-#ifdef MODULE
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/interrupt.h>
-
-
-MODULE_LICENSE("GPL");
-
-#endif
-
-#ifndef CONFIG_PCI
-#error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)"
-#endif
-
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/poll.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/poll.h>
@@
-84,6
+73,9
@@
MODULE_LICENSE("GPL");
#include "dt3155_io.h"
#include "allocator.h"
#include "dt3155_io.h"
#include "allocator.h"
+
+MODULE_LICENSE("GPL");
+
/* Error variable. Zero means no error. */
int dt3155_errno = 0;
/* Error variable. Zero means no error. */
int dt3155_errno = 0;
@@
-472,9
+464,9
@@
static void dt3155_init_isr(int minor)
/* 50/60 Hz should be set before this point but let's make sure it is */
/* right anyway */
/* 50/60 Hz should be set before this point but let's make sure it is */
/* right anyway */
- ReadI2C(dt3155_lbase[ minor ], C
ONFIG
, &i2c_csr2.reg);
+ ReadI2C(dt3155_lbase[ minor ], C
SR2
, &i2c_csr2.reg);
i2c_csr2.fld.HZ50 = FORMAT50HZ;
i2c_csr2.fld.HZ50 = FORMAT50HZ;
- WriteI2C(dt3155_lbase[ minor ], C
ONFIG, i2c_config
.reg);
+ WriteI2C(dt3155_lbase[ minor ], C
SR2, i2c_csr2
.reg);
/* enable busmaster chip, clear flags */
/* enable busmaster chip, clear flags */