Revision: 5314 Author: pebender Date: Mon Aug 17 13:10:14 2009 Log: - Fixed patch so that it does not break compilation with kernel versions less than 2.6.31.
http://code.google.com/p/minimyth/source/detail?r=5314 Modified: /trunk/gar-minimyth/script/system/lirc/checksums /trunk/gar-minimyth/script/system/lirc/files/lirc-20090816Z-lirc_i2c_fix.patch ======================================= --- /trunk/gar-minimyth/script/system/lirc/checksums Mon Aug 17 10:51:59 2009 +++ /trunk/gar-minimyth/script/system/lirc/checksums Mon Aug 17 13:10:14 2009 @@ -1,4 +1,4 @@ -16c54816a79b6d9fad6516d6d0ad14ea download/lirc-20090816Z-lirc_i2c_fix.patch +e244c09a7f08fbde186b9df0c8ca7b7e download/lirc-20090816Z-lirc_i2c_fix.patch 6cf0039616d50c071271495db13806f8 download/lirc-20090816Z-no_python.patch 66a41fefd9e2ed02d5d35a69bdce7061 download/lirc-20090816Z-remove_smp_unsafe_drivers.patch d23f1aa5bb8e4d0de997e0bd5502d496 download/lirc-20090816Z-input_map.patch.gar ======================================= --- /trunk/gar-minimyth/script/system/lirc/files/lirc-20090816Z-lirc_i2c_fix.patch Mon Aug 17 10:51:59 2009 +++ /trunk/gar-minimyth/script/system/lirc/files/lirc-20090816Z-lirc_i2c_fix.patch Mon Aug 17 13:10:14 2009 @@ -1,15 +1,11 @@ diff -Naur lirc-20090816Z-old/drivers/lirc_i2c/lirc_i2c.c lirc-20090816Z-new/drivers/lirc_i2c/lirc_i2c.c --- lirc-20090816Z-old/drivers/lirc_i2c/lirc_i2c.c 2009-08-04 17:31:10.000000000 -0700 -+++ lirc-20090816Z-new/drivers/lirc_i2c/lirc_i2c.c 2009-08-16 13:31:19.000000000 -0700 -@@ -380,6 +380,20 @@ ++++ lirc-20090816Z-new/drivers/lirc_i2c/lirc_i2c.c 2009-08-17 13:06:12.000000000 -0700 +@@ -380,6 +380,16 @@ static int ir_remove(struct i2c_client *client); static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) -+static struct i2c_client client_template = { -+ .name = "unset", -+ .driver = &driver -+}; +#else +static const struct i2c_device_id ir_receiver_id[] = { + /* Generic entry for any IR receiver */ @@ -22,24 +18,16 @@ static struct i2c_driver driver = { #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) .name = "i2c ir driver", -@@ -403,20 +417,6 @@ +@@ -408,12 +418,6 @@ + .driver = &driver }; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) --static struct i2c_client client_template = { -- .name = "unset", -- .driver = &driver --}; --#else + #else -static const struct i2c_device_id ir_receiver_id[] = { - /* Generic entry for any IR receiver */ - { "ir_video", 0 }, - /* IR device specific entries could be added here */ - { } -}; --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - static int ir_attach(struct i2c_adapter *adap, int addr, - unsigned short flags, int kind) - #else + #endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
