diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-05-14 23:14:02 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-05-14 23:14:02 -0700 |
| commit | 8a9af19ff3b8c8a5884656c2679f7984fd49db63 (patch) | |
| tree | ad12aba937bec72b9b262108b90c972cdbd09c18 /include | |
| parent | 77b3055a2a25b7ba9f5718651e7e89e5952d4912 (diff) | |
| parent | 4352430976a0b40351483cd8d3a2091dde8d9582 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 5 | ||||
| -rw-r--r-- | include/linux/sysfs.h | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 208d615b103d..4c0c364aabc6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -29,13 +29,14 @@ #include <linux/list.h> #include <linux/spinlock.h> #include <linux/types.h> +#include <linux/ioport.h> #include <asm/semaphore.h> #include <asm/atomic.h> #define DEVICE_NAME_SIZE 50 #define DEVICE_NAME_HALF __stringify(20) /* Less than half to accommodate slop */ #define DEVICE_ID_SIZE 32 -#define BUS_ID_SIZE 20 +#define BUS_ID_SIZE KOBJ_NAME_LEN enum { @@ -388,6 +389,8 @@ struct platform_device { char * name; u32 id; struct device dev; + struct resource res; + unsigned int irq; }; extern int platform_device_register(struct platform_device *); diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 3e9565e2abe1..d639e18caa91 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -16,18 +16,11 @@ struct attribute { mode_t mode; }; -struct sysfs_bin_buffer { - u8 * data; - size_t size; - size_t count; - loff_t offset; -}; - struct bin_attribute { struct attribute attr; size_t size; - ssize_t (*read)(struct kobject *, struct sysfs_bin_buffer *); - ssize_t (*write)(struct kobject *, struct sysfs_bin_buffer *); + ssize_t (*read)(struct kobject *, char *, loff_t, size_t); + ssize_t (*write)(struct kobject *, char *, loff_t, size_t); }; struct sysfs_ops { |