diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
| commit | d1653548d29959a6ea6b4037a00b48a28257e6e6 (patch) | |
| tree | c5e53b262c5cfe2be50066b5b9c886c23a4ec3d6 /arch/sandbox/include/asm/rtc.h | |
| parent | f3384c6ddaab99a77895443b10d2034f17ca0014 (diff) | |
| parent | d99e6f78dedd473771d6dee1007a05b8574d5b5c (diff) | |
Merge branch '2023-03-02-kconfig-and-CONFIG-cleanups' into next
- Partial merge of a series of mine to select some framework options
that shouldn't be prompted for (and remove some unused code related to
that), and a partial merge of a series from Simon to remove some dead
code and address various CONFIG_IS_ENABLED/IS_ENABLED issues in code.
Diffstat (limited to 'arch/sandbox/include/asm/rtc.h')
| -rw-r--r-- | arch/sandbox/include/asm/rtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sandbox/include/asm/rtc.h b/arch/sandbox/include/asm/rtc.h index 025cd6c67cf..bf3ac5ea1ec 100644 --- a/arch/sandbox/include/asm/rtc.h +++ b/arch/sandbox/include/asm/rtc.h @@ -40,7 +40,7 @@ enum { * @reg: Register values */ struct sandbox_i2c_rtc_plat_data { -#if CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_PLATDATA) && IS_ENABLED(CONFIG_RTC_SANDBOX) struct dtd_sandbox_i2c_rtc_emul dtplat; #endif long base_time; |