git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
ieee1394
/
csr1212.h
diff --git
a/drivers/ieee1394/csr1212.h
b/drivers/ieee1394/csr1212.h
index
e673426
..
17ddd72
100644
(file)
--- a/
drivers/ieee1394/csr1212.h
+++ b/
drivers/ieee1394/csr1212.h
@@
-37,7
+37,6
@@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <linux/sched.h>
#include <linux/vmalloc.h>
#include <asm/pgalloc.h>
#include <linux/vmalloc.h>
#include <asm/pgalloc.h>
@@
-193,6
+192,7
@@
#define CSR1212_EXTENDED_ROM_SIZE (0x10000 * sizeof(u_int32_t))
#define CSR1212_EXTENDED_ROM_SIZE (0x10000 * sizeof(u_int32_t))
+#define CSR1212_INVALID_ADDR_SPACE -1
/* Config ROM image structures */
struct csr1212_bus_info_block_img {
/* Config ROM image structures */
struct csr1212_bus_info_block_img {
@@
-647,7
+647,7
@@
static inline struct csr1212_csr_rom_cache *csr1212_rom_cache_malloc(u_int32_t o
{
struct csr1212_csr_rom_cache *cache;
{
struct csr1212_csr_rom_cache *cache;
- cache = CSR1212_MALLOC(sizeof(
struct csr1212_csr_rom_
cache) + size);
+ cache = CSR1212_MALLOC(sizeof(
*
cache) + size);
if (!cache)
return NULL;
if (!cache)
return NULL;