diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:51:10 -0700 |
| commit | afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (patch) | |
| tree | b7b24e134d34f17e62085ecb8a9583e00f1c7248 /net | |
| parent | 269f21344b23e552c21c9e2d7ca258479dcd7a0a (diff) | |
| parent | 4f95f81a48623982879f4fa80c641933444afd18 (diff) | |
| download | op-kernel-dev-afa26be86b65a7183ceac29bdf1f51d6fc6932f0.zip op-kernel-dev-afa26be86b65a7183ceac29bdf1f51d6fc6932f0.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: allow read access to available/current_clocksource
clocksource: Fix permissions for available_clocksource
hrtimer: remove duplicate helper function
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/bcm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 74fd2d3..d9a3a9d 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -412,12 +412,6 @@ static void bcm_rx_changed(struct bcm_op *op, struct can_frame *data) bcm_send_to_user(op, &head, data, 1); } -/* TODO: move to linux/hrtimer.h */ -static inline int hrtimer_callback_running(struct hrtimer *timer) -{ - return timer->state & HRTIMER_STATE_CALLBACK; -} - /* * bcm_rx_update_and_send - process a detected relevant receive content change * 1. update the last received data |
