diff --git a/[refs] b/[refs] index 4f0f83154b31..a11132cfe3b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 338cec3253a6d43d02e5e96abc327197565efcc8 +refs/heads/master: f8e38dde33b839bb9e9f98e88688bfac1811d57a diff --git a/trunk/include/asm-arm26/hardirq.h b/trunk/include/asm-arm26/hardirq.h index 791ee1da9bfa..dc28daab8aa8 100644 --- a/trunk/include/asm-arm26/hardirq.h +++ b/trunk/include/asm-arm26/hardirq.h @@ -22,8 +22,6 @@ typedef struct { # error HARDIRQ_BITS is too low! #endif -#define irq_enter() (preempt_count() += HARDIRQ_OFFSET) - #ifndef CONFIG_SMP extern asmlinkage void __do_softirq(void);