Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commitc8ffd1356d, reversing changes made to2ee6f3a5f7. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -10,8 +10,6 @@
|
||||
#ifndef _MRC_H_
|
||||
#define _MRC_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#define MRC_VERSION 0x0111
|
||||
|
||||
/* architectural definitions */
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/**
|
||||
* msg_port_setup - set up the message port control register
|
||||
*
|
||||
|
||||
@@ -71,8 +71,6 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/* variable range MTRR usage */
|
||||
enum {
|
||||
MTRR_VAR_ROM,
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#define _COREBOOT_SYSINFO_H
|
||||
|
||||
#include <asm/coreboot_tables.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
/* Maximum number of memory range definitions */
|
||||
#define SYSINFO_MAX_MEM_RANGES 32
|
||||
|
||||
@@ -8,9 +8,6 @@
|
||||
#ifndef _COREBOOT_TABLES_H
|
||||
#define _COREBOOT_TABLES_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
struct timestamp_entry {
|
||||
u32 entry_id;
|
||||
u64 entry_stamp;
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
#ifndef __EARLY_CMOS_H
|
||||
#define __EARLY_CMOS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/* CMOS actually resides in the RTC SRAM */
|
||||
#define CMOS_IO_PORT 0x70
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <linux/types.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/mrccache.h>
|
||||
#include <asm/u-boot.h>
|
||||
|
||||
enum pei_boot_mode_t {
|
||||
PEI_BOOT_NONE = 0,
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
#ifndef __x86_asm_handoff_h
|
||||
#define __x86_asm_handoff_h
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/**
|
||||
* struct arch_spl_handoff - architecture-specific handoff info
|
||||
*
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#define __ASM_ME_COMMON_H
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/types.h>
|
||||
#include <pci.h>
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <asm/atomic.h>
|
||||
#include <asm/cache.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/errno.h>
|
||||
|
||||
struct udevice;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user