diff options
| author | Anton Blanchard <anton@samba.org> | 2002-08-30 13:04:20 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2002-08-30 13:04:20 +1000 |
| commit | b850a6ebb1d32ebb74ff87efcd83cc7831e6e382 (patch) | |
| tree | 087dbb6c44ed5acacde26de66982e161203e265e | |
| parent | 1c24198eb25ee2b89f871097f6a414939c86d6f7 (diff) | |
ppc64: Compile in LLC, needed for token ring
| -rw-r--r-- | arch/ppc64/defconfig | 3 | ||||
| -rw-r--r-- | include/asm-ppc64/processor.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig index f97afb3a4119..36f055529a94 100644 --- a/arch/ppc64/defconfig +++ b/arch/ppc64/defconfig @@ -229,7 +229,8 @@ CONFIG_SYN_COOKIES=y CONFIG_IPV6=m # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set -# CONFIG_LLC is not set +CONFIG_LLC=y +# CONFIG_LLC_UI is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DEV_APPLETALK is not set diff --git a/include/asm-ppc64/processor.h b/include/asm-ppc64/processor.h index 50f57a65ca02..914382934892 100644 --- a/include/asm-ppc64/processor.h +++ b/include/asm-ppc64/processor.h @@ -366,7 +366,7 @@ #define IMISS SPRN_IMISS /* Instruction TLB Miss Register */ #define IMMR SPRN_IMMR /* PPC 860/821 Internal Memory Map Register */ #define L2CR SPRN_L2CR /* PPC 750 L2 control register */ -#define LR SPRN_LR +#define __LR SPRN_LR #define PVR SPRN_PVR /* Processor Version */ #define PIR SPRN_PIR /* Processor ID */ #define RPA SPRN_RPA /* Required Physical Address Register */ |