Commit efe00e6a authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.linux1394.org/ieee1394-2.6

into evo.osdl.org:/home/torvalds/v2.6/linux
parents ea59d34d f23ac28c
...@@ -517,7 +517,7 @@ static void ohci_initialize(struct ti_ohci *ohci) ...@@ -517,7 +517,7 @@ static void ohci_initialize(struct ti_ohci *ohci)
1<<(((reg_read(ohci, OHCI1394_BusOptions)>>12)&0xf)+1); 1<<(((reg_read(ohci, OHCI1394_BusOptions)>>12)&0xf)+1);
if (ohci->max_packet_size < 512) { if (ohci->max_packet_size < 512) {
HPSB_WARNING("warning: Invalid max packet size of %d, setting to 512", HPSB_ERR("warning: Invalid max packet size of %d, setting to 512",
ohci->max_packet_size); ohci->max_packet_size);
ohci->max_packet_size = 512; ohci->max_packet_size = 512;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment