diff options
| author |   Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 20:55:11 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 20:55:11 +0400 |
| commit | 913272b3864d6da89c70d9fc2c30ccb57794b369 (patch) | |
| tree | 4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /arch/powerpc/kernel/jump_label.c | |
| parent | power_supply: Mark da9052 driver as broken (diff) | |
| parent | collie_battery: Get rid of irq_to_gpio usage (diff) | |
| download | linux-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.tar.xz linux-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.zip | |
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'arch/powerpc/kernel/jump_label.c')
| -rw-r--r-- | arch/powerpc/kernel/jump_label.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c index 368d158d665d..a1ed8a8c7cb4 100644 --- a/arch/powerpc/kernel/jump_label.c +++ b/arch/powerpc/kernel/jump_label.c @@ -11,6 +11,7 @@ #include <linux/jump_label.h> #include <asm/code-patching.h> +#ifdef HAVE_JUMP_LABEL void arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type) { @@ -21,3 +22,4 @@ void arch_jump_label_transform(struct jump_entry *entry, else patch_instruction(addr, PPC_INST_NOP); } +#endif |