diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 00:27:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 00:27:51 -0400 |
| commit | 141dc40ee343ab532717b235dd645e2d25ae3092 (patch) | |
| tree | 2289e5d1ec20df5e465b9b629e291877f4d70485 /arch/parisc/Makefile | |
| parent | 1c83d94ff646001f9ee83f0330a3933b55660927 (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
Merge 3.10-rc5 into usb-next
We need the changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/Makefile')
| -rw-r--r-- | arch/parisc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 197690068f88..96ec3982be8d 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile | |||
| @@ -66,7 +66,7 @@ KBUILD_CFLAGS_KERNEL += -mlong-calls | |||
| 66 | endif | 66 | endif |
| 67 | 67 | ||
| 68 | # select which processor to optimise for | 68 | # select which processor to optimise for |
| 69 | cflags-$(CONFIG_PA7100) += -march=1.1 -mschedule=7100 | 69 | cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100 |
| 70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 | 70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 |
| 71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC | 71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC |
| 72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 | 72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 |