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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
include
/
pcmcia
/
ds.h
diff --git
a/include/pcmcia/ds.h
b/include/pcmcia/ds.h
index
b707a60
..
cb8b6e6
100644
(file)
--- a/
include/pcmcia/ds.h
+++ b/
include/pcmcia/ds.h
@@
-151,6
+151,8
@@
struct pcmcia_device {
uniquely define a pcmcia_device */
struct pcmcia_socket *socket;
+ char *devname;
+
u8 device_no;
/* the hardware "function" device; certain subdevices can