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 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
b43
/
pcmcia.c
diff --git
a/drivers/net/wireless/b43/pcmcia.c
b/drivers/net/wireless/b43/pcmcia.c
index
7dcba5f
..
2c8461d
100644
(file)
--- a/
drivers/net/wireless/b43/pcmcia.c
+++ b/
drivers/net/wireless/b43/pcmcia.c
@@
-32,7
+32,7
@@
#include <pcmcia/cisreg.h>
-static
/*const */
struct pcmcia_device_id b43_pcmcia_tbl[] = {
+static
const
struct pcmcia_device_id b43_pcmcia_tbl[] = {
PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448),
PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476),
PCMCIA_DEVICE_NULL,