diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 16:05:09 +0200 |
| commit | 191a66353b22fad8ac89404ab4c929cbe7b0afb2 (patch) | |
| tree | bd7affc4bc640eb42e5ff3285922497285f8fdd7 /arch/blackfin/mach-bf527/include/mach/defBF525.h | |
| parent | f5d6a52f511157c7476590532a23b5664b1ed877 (diff) | |
| parent | f21262b8e092a770e39fbd405cc18a0247c3af68 (diff) | |
| download | talos-op-linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.tar.gz talos-op-linux-191a66353b22fad8ac89404ab4c929cbe7b0afb2.zip | |
Merge branch 'x86/asm' into x86/apic, to resolve a conflict
Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf527/include/mach/defBF525.h')
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF525.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index 71578d964d00..591e00ff620a 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h @@ -77,10 +77,6 @@ #define USB_APHY_CNTRL2 0xffc039e8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ -/* (PHY_TEST is for ADI usage only) */ - -#define USB_PHY_TEST 0xffc039ec /* Used for reducing simulation time and simplifies FIFO testability */ - #define USB_PLLOSC_CTRL 0xffc039f0 /* Used to program different parameters for USB PLL and Oscillator */ #define USB_SRP_CLKDIV 0xffc039f4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ |
