mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
bcm47xx compile fix for .21, thanks to noz
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7337 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -675,8 +675,14 @@ static void unregister_buttons(struct button_t *b)
|
||||
gpio_set_irqenable(0, button_handler);
|
||||
}
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||
static void hotplug_button(struct work_struct *work)
|
||||
{
|
||||
struct event_t *event = container_of(work, struct event_t, wq);
|
||||
#else
|
||||
static void hotplug_button(struct event_t *event)
|
||||
{
|
||||
#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
||||
call_usermodehelper (event->argv[0], event->argv, event->envp, 1);
|
||||
#else
|
||||
@@ -724,7 +730,11 @@ static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs)
|
||||
scratch += sprintf (scratch, "SEEN=%ld", (jiffies - b->seen)/HZ) + 1;
|
||||
event->envp[i] = 0;
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||
INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
|
||||
#else
|
||||
INIT_WORK(&event->wq, (void *)(void *)hotplug_button, (void *)event);
|
||||
#endif
|
||||
schedule_work(&event->wq);
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,11 @@ static struct platform_t platform;
|
||||
static void register_buttons(struct button_t *b);
|
||||
static void unregister_buttons(struct button_t *b);
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
|
||||
static void hotplug_button(struct work_struct *work);
|
||||
#else
|
||||
static void hotplug_button(struct event_t *event);
|
||||
#endif
|
||||
static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs);
|
||||
|
||||
/* leds */
|
||||
|
||||
Reference in New Issue
Block a user