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 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
orinoco
/
orinoco_plx.c
diff --git
a/drivers/net/wireless/orinoco/orinoco_plx.c
b/drivers/net/wireless/orinoco/orinoco_plx.c
index
9358f4d
..
2bac824
100644
(file)
--- a/
drivers/net/wireless/orinoco/orinoco_plx.c
+++ b/
drivers/net/wireless/orinoco/orinoco_plx.c
@@
-4,7
+4,7
@@
* but are connected to the PCI bus by a PLX9052.
*
* Current maintainers are:
* but are connected to the PCI bus by a PLX9052.
*
* Current maintainers are:
- * Pavel Roskin <proski AT gnu.org>
+ * Pavel Roskin <proski AT gnu.org>
* and David Gibson <hermes AT gibson.dropbear.id.au>
*
* (C) Copyright David Gibson, IBM Corp. 2001-2003.
* and David Gibson <hermes AT gibson.dropbear.id.au>
*
* (C) Copyright David Gibson, IBM Corp. 2001-2003.
@@
-102,14
+102,14
@@
#define PLX_RESET_TIME (500) /* milliseconds */
#define PLX_INTCSR 0x4c /* Interrupt Control & Status Register */
#define PLX_RESET_TIME (500) /* milliseconds */
#define PLX_INTCSR 0x4c /* Interrupt Control & Status Register */
-#define PLX_INTCSR_INTEN (1
<<
6) /* Interrupt Enable bit */
+#define PLX_INTCSR_INTEN (1
<<
6) /* Interrupt Enable bit */
/*
* Do a soft reset of the card using the Configuration Option Register
*/
static int orinoco_plx_cor_reset(struct orinoco_private *priv)
{
/*
* Do a soft reset of the card using the Configuration Option Register
*/
static int orinoco_plx_cor_reset(struct orinoco_private *priv)
{
-
hermes_t
*hw = &priv->hw;
+
struct hermes
*hw = &priv->hw;
struct orinoco_pci_card *card = priv->card;
unsigned long timeout;
u16 reg;
struct orinoco_pci_card *card = priv->card;
unsigned long timeout;
u16 reg;