diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-03 23:59:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-03 23:59:30 +0000 |
| commit | 4ebc4e7b1fb505e8bdefa28300362807aeb2637d (patch) | |
| tree | 22242ef93d7f3e05eed7e197a9cdae7ea7756192 /packages/orinoco/orinoco-modules-0.15rc2/add_event.patch | |
| parent | be7692e9a2108a97200faa7a209392fd7a0ff5f5 (diff) | |
| parent | 9a557780ebd04f9360ec67c8239e4bd1019f82cd (diff) | |
propagate from branch 'org.openembedded.dev' (head 12b28d2f47b4bb757cdc94aa084d2b6b9c38c66e)
to branch 'org.openembedded.nslu2-linux' (head ff15002fcc43ca86213d05b5884b65d34d38b371)
Diffstat (limited to 'packages/orinoco/orinoco-modules-0.15rc2/add_event.patch')
| -rw-r--r-- | packages/orinoco/orinoco-modules-0.15rc2/add_event.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch b/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch new file mode 100644 index 0000000000..f8b86f335b --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.15rc2/add_event.patch @@ -0,0 +1,56 @@ +Index: orinoco-0.15rc2/orinoco_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/orinoco_cs.c 2004-07-28 07:06:45.000000000 +0100 ++++ orinoco-0.15rc2/orinoco_cs.c 2005-08-03 18:38:34.000000000 +0100 +@@ -189,11 +189,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &orinoco_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -612,6 +614,9 @@ + .name = DRIVER_NAME, + }, + .attach = orinoco_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = orinoco_cs_event, ++#endif + .detach = orinoco_cs_detach, + }; + +Index: orinoco-0.15rc2/spectrum_cs.c +=================================================================== +--- orinoco-0.15rc2.orig/spectrum_cs.c 2005-08-03 11:51:09.000000000 +0100 ++++ orinoco-0.15rc2/spectrum_cs.c 2005-08-03 18:38:46.000000000 +0100 +@@ -699,11 +699,13 @@ + + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = + CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &spectrum_cs_event; ++#endif + client_reg.Version = 0x0210; /* FIXME: what does this mean? */ + client_reg.event_callback_args.client_data = link; + +@@ -1096,6 +1098,9 @@ + .name = DRIVER_NAME, + }, + .attach = spectrum_cs_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = spectrum_cs_event, ++#endif + .detach = spectrum_cs_detach, + }; + |