diff --git a/[refs] b/[refs] index f3d90c30104b..bbbc5accef84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06552ccc36abeb12e37efc16c384dc7f30794f85 +refs/heads/master: 0dc8335aa3e59f1adbb0fce7c9c0b342146cd036 diff --git a/trunk/include/linux/oprofile.h b/trunk/include/linux/oprofile.h index 1d9518bc4c58..dbbe2dbc4418 100644 --- a/trunk/include/linux/oprofile.h +++ b/trunk/include/linux/oprofile.h @@ -171,7 +171,6 @@ struct op_sample; struct op_entry { struct ring_buffer_event *event; struct op_sample *sample; - unsigned long irq_flags; unsigned long size; unsigned long *data; };