projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] trivial iomem annotations: istallion
[powerpc.git]
/
drivers
/
ieee1394
/
ieee1394_core.c
diff --git
a/drivers/ieee1394/ieee1394_core.c
b/drivers/ieee1394/ieee1394_core.c
index
49354de
..
5fccf9f
100644
(file)
--- a/
drivers/ieee1394/ieee1394_core.c
+++ b/
drivers/ieee1394/ieee1394_core.c
@@
-20,7
+20,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/string.h>
@@
-36,7
+35,6
@@
#include <linux/kthread.h>
#include <asm/byteorder.h>
#include <linux/kthread.h>
#include <asm/byteorder.h>
-#include <asm/semaphore.h>
#include "ieee1394_types.h"
#include "ieee1394.h"
#include "ieee1394_types.h"
#include "ieee1394.h"
@@
-87,7
+85,7
@@
static void dump_packet(const char *text, quadlet_t *data, int size, int speed)
printk("\n");
}
#else
printk("\n");
}
#else
-#define dump_packet(a,b,c,d)
+#define dump_packet(a,b,c,d)
do {} while (0)
#endif
static void abort_requests(struct hpsb_host *host);
#endif
static void abort_requests(struct hpsb_host *host);
@@
-356,10
+354,12
@@
static void build_speed_map(struct hpsb_host *host, int nodecount)
}
}
}
}
+#if SELFID_SPEED_UNKNOWN != IEEE1394_SPEED_MAX
/* assume maximum speed for 1394b PHYs, nodemgr will correct it */
for (n = 0; n < nodecount; n++)
/* assume maximum speed for 1394b PHYs, nodemgr will correct it */
for (n = 0; n < nodecount; n++)
- if (speedcap[n] ==
3
)
+ if (speedcap[n] ==
SELFID_SPEED_UNKNOWN
)
speedcap[n] = IEEE1394_SPEED_MAX;
speedcap[n] = IEEE1394_SPEED_MAX;
+#endif
}
}
@@
-1170,7
+1170,7
@@
static void __exit ieee1394_cleanup(void)
unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
}
unregister_chrdev_region(IEEE1394_CORE_DEV, 256);
}
-module_init(ieee1394_init);
+fs_initcall(ieee1394_init); /* same as ohci1394 */
module_exit(ieee1394_cleanup);
/* Exported symbols */
module_exit(ieee1394_cleanup);
/* Exported symbols */