summaryrefslogtreecommitdiffstats
path: root/drivers/misc/ibmasm/ibmasm.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
committerLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
commit292dd876ee765c478b27c93cc51e93a558ed58bf (patch)
tree5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/misc/ibmasm/ibmasm.h
parent[ACPI] remove "Resource isn't an IRQ" warning (diff)
parent[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff)
downloadlinux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz
linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip
Pull release into acpica branch
Diffstat (limited to 'drivers/misc/ibmasm/ibmasm.h')
-rw-r--r--drivers/misc/ibmasm/ibmasm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index d7e20a34f88d..1cef2387fa65 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -141,8 +141,8 @@ struct reverse_heartbeat {
};
struct ibmasm_remote {
- struct input_dev keybd_dev;
- struct input_dev mouse_dev;
+ struct input_dev *keybd_dev;
+ struct input_dev *mouse_dev;
};
struct service_processor {
@@ -157,7 +157,7 @@ struct service_processor {
char dirname[IBMASM_NAME_SIZE];
char devname[IBMASM_NAME_SIZE];
unsigned int number;
- struct ibmasm_remote *remote;
+ struct ibmasm_remote remote;
int serial_line;
struct device *dev;
};